Changeset 495 for Dev/trunk/src/client/qed-client/widgets/Selector.js

Timestamp:

03/10/14 00:47:38 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored TabbedBrowser? out of TabbedQuestionBrowser?.
• Remove questions from overview when deleted.
• Only return topics that are inhabited in a category when one is specified.

File:

• Dev/trunk/src/client/qed-client/widgets/Selector.js (modified) (6 diffs)

Dev/trunk/src/client/qed-client/widgets/Selector.js

@@ -64 +64 @@
             var actions = {};
             var action = null;
-            if ( this.selectedActions !== null ) {
-                for (var actionName in this.selectedActions) {
-                    if ( this.selectedActions.hasOwnProperty(actionName) ) {
-                        action = this.selectedActions[actionName];
+            var userActions =
+                    lang.isFunction(this.selectedActions) ?
+                    this.selectedActions() :
+                    this.selectedActions;
+            if ( userActions ) {
+                for (var actionName in userActions) {
+                    if ( userActions.hasOwnProperty(actionName) ) {
+                        action = userActions[actionName];
                         actions[actionName] = {
                             callback: action.callback &&
-                                    lang.hitch(this,this._onSelectedAction,
-                                            action.callback),
+                                      lang.hitch(this,this._onSelectedAction,
+                                                 action.callback),
                             properties: {
                                 blockButton: true,
@@ -135 +139 @@
         _onSelectedAction: function(callback) {
             if (this._selectedItem && callback) {
-                callback(this._selectedItem);
+                callback(this._selectedItem,this);
             }
         },
@@ -171 +175 @@
             }
         },
+        removeItem: function(item) {
+            var nodes = this._source ?
+                        this._source.getAllNodes() :
+                        this.optionsNode.childNodes;
+            baseArray.forEach(nodes, function(node) {
+                var widget = registry.byNode(node);
+                if ( widget && this.itemEquals ?
+                               this.itemEquals(widget.__item,item) :
+                               widget.__item === item ) {
+                    widget.destroyRecursive();
+                    if ( this._source ) { this._source.delItem(widget.id); }
+                }
+            }, this);
+        },
         _createNode: function(item, hint) {
             var node = hint === "avatar" ?
@@ -188 +206 @@
         _createLineNode: function(item) {
             var actions = {};
-            var action;
-            if (this.itemActions) {
-                for (var actionName in this.itemActions) {
-                    if ( this.itemActions.hasOwnProperty(actionName) ) {
-                        action = this.itemActions[actionName];
+            var userActions =
+                    lang.isFunction(this.itemActions) ?
+                    this.itemActions(item) :
+                    this.itemActions;
+            if (userActions) {
+                for (var actionName in userActions) {
+                    if ( userActions.hasOwnProperty(actionName) ) {
+                        var action = userActions[actionName];
                         actions[actionName] = {
-                            callback: action.callback && lang.partial(action.callback,item),
+                            callback: action.callback &&
+                                      lang.partial(action.callback,item,this),
                             properties: {
                                 blockButton: false,
@@ -207 +229 @@
             var w = new LineWithActionsWidget({
                 title: get(this.itemTitle,item),
-                actions: actions
+                actions: actions,
+                __item: item
             });
             w.startup();
@@ -214 +237 @@
         },
 
-        onSelect: function(/*item*/) {}
+        onSelect: function(/*item*/) {},
+
+        destroy: function() {
+            if ( this._source ) { this._source.destroy(); }
+            this.inherited(arguments);
+        }
     });
 });