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

Timestamp:

07/01/13 03:34:23 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Fixed deploy script.
Fix for ... in ... complaints by jshint.
Fix a typo.

File:

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

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

@@ -57 +57 @@
             if ( this.selectedActions !== null ) {
                 for (var actionName in this.selectedActions) {
-                    action = this.selectedActions[actionName];
-                    actions[actionName] = {
-                        callback: action.callback &&
-                                lang.hitch(this,this._onSelectedAction,
-                                        action.callback),
-                        properties: {
-                            blockButton: true,
-                            label: action.title || actionName,
-                            icon: action.icon,
-                            tooltip: action.description
-                        }
-
-                    };
+                    if ( this.selectedActions.hasOwnProperty(actionName) ) {
+                        action = this.selectedActions[actionName];
+                        actions[actionName] = {
+                            callback: action.callback &&
+                                    lang.hitch(this,this._onSelectedAction,
+                                            action.callback),
+                            properties: {
+                                blockButton: true,
+                                label: action.title || actionName,
+                                icon: action.icon,
+                                tooltip: action.description
+                            }
+
+                        };
+                    }
                 }
             }
@@ -180 +182 @@
             if (this.itemActions) {
                 for (var actionName in this.itemActions) {
-                    action = this.itemActions[actionName];
-                    actions[actionName] = {
-                        callback: action.callback && lang.partial(action.callback,item),
-                        properties: {
-                            blockButton: false,
-                            showLabel: false,
-                            icon: action.icon + " black",
-                            tooltip: action.description
-                        }
-                    };
+                    if ( this.itemActions.hasOwnProperty(actionName) ) {
+                        action = this.itemActions[actionName];
+                        actions[actionName] = {
+                            callback: action.callback && lang.partial(action.callback,item),
+                            properties: {
+                                blockButton: false,
+                                showLabel: false,
+                                icon: action.icon + " black",
+                                tooltip: action.description
+                            }
+                        };
+                    }
                 }
             }