Fix support for action items in plugins

ecv80 · May 20, 2016 · 7440536 · 7440536
1 parent 0d2753f
commit 7440536
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/glwskins/flat/items/list/action.view b/glwskins/flat/items/list/action.view
@@ -17,6 +17,7 @@ widget(container_z, {
 
  widget(icon, {
  style: "ListItemIcon";
+ source: "skin:https://icons/ic_" + $self.subtype + "_48px.svg";
  });
 
  widget(label, {

diff --git a/res/ecmascript/modules/showtime/page.js b/res/ecmascript/modules/showtime/page.js
@@ -48,14 +48,26 @@ Item.prototype.disable = function() {
  this.root.enabled = false;
 }
 
-Item.prototype.addOptAction = function(title, action) {
+Item.prototype.destroyOption = function(item) {
+ prop.destroy(item);
+}
+
+Item.prototype.addOptAction = function(title, func, subtype) {
  var node = prop.createRoot();
  node.type = 'action';
  node.metadata.title = title;
  node.enabled = true;
- node.action = action;
-
+ node.subtype = subtype;
+
+ prop.subscribe(node.eventSink, function(type, val) {
+ if(type == "action" && val.indexOf('Activate') != -1)
+ func();
+ }, {
+ autoDestroy: true,
+ actionAsArray: true,
+ });
  prop.setParent(node, this.root.options);
+ return node;
 }
 
 

diff --git a/src/ecmascript/es_prop.c b/src/ecmascript/es_prop.c
@@ -31,6 +31,7 @@ typedef struct es_prop_sub {
  es_resource_t eps_super;
  prop_sub_t *eps_sub;
  char eps_autodestry;
+ char eps_action_as_array;
 } es_prop_sub_t;
 
 static void
@@ -627,14 +628,30 @@ es_sub_cb(void *opaque, prop_event_t event, ...)
  const event_payload_t *ep = (const event_payload_t *)e;
  nargs = 2;
  duk_push_string(ctx, "action");
- duk_push_string(ctx, ep->payload);
+
+ if(eps->eps_action_as_array) {
+ duk_push_array(ctx);
+ duk_push_string(ctx, ep->payload);
+ duk_put_prop_index(ctx, -2, 0);
+ } else {
+ duk_push_string(ctx, ep->payload);
+ }
 
  } else if(e->e_type == EVENT_ACTION_VECTOR) {
  const event_action_vector_t *eav = (const event_action_vector_t *)e;
  assert(eav->num > 0);
  nargs = 2;
  duk_push_string(ctx, "action");
- duk_push_string(ctx, action_code2str(eav->actions[0]));
+
+ if(eps->eps_action_as_array) {
+ duk_push_array(ctx);
+ for(int i = 0; i < eav->num; i++) {
+ duk_push_string(ctx, action_code2str(eav->actions[i]));
+ duk_put_prop_index(ctx, -2, i);
+ }
+ } else {
+ duk_push_string(ctx, action_code2str(eav->actions[0]));
+ }
 
  } else if(e->e_type == EVENT_UNICODE) {
  const event_int_t *eu = (const event_int_t *)e;
@@ -710,6 +727,9 @@ es_prop_subscribe(duk_context *ctx)
  if(es_prop_is_true(ctx, 2, "earlyChildDelete"))
  flags |= PROP_SUB_EARLY_DEL_CHILD;
 
+ if(es_prop_is_true(ctx, 2, "actionAsArray"))
+ eps->eps_action_as_array = 1;
+
  eps->eps_sub =
  prop_subscribe(flags,
  PROP_TAG_ROOT, p,