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

Timestamp:

03/12/14 15:16:54 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored out general object mapping and iteration.
• Split widgets for multiplechoice and singlechoice.
• Restored readOnly/disabled setting for QuestionEditorPreviewItem? on innerWidget (since view innerWidget is not a form anymore, we cannot just set it on that, we iterate over all form children now).

File:

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

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

@@ -1 +1 @@
 define([
+    "../lib/object",
     "./LineWithActionsWidget",
     "dijit/_Container",
@@ -16 +17 @@
     "dojo/query",
     "dojo/text!./templates/Selector.html"
-], function(LineWithActionsWidget, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, registry, baseArray, declare, event, lang, Source, domClass, domConstruct, fx, query, templateString) {
+], function(objectFuns, LineWithActionsWidget, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, registry, baseArray, declare, event, lang, Source, domClass, domConstruct, fx, query, templateString) {
 
     function get(selector, item) {
@@ -62 +63 @@
         },
         _createTitleLine: function() {
-            var actions = {};
-            var action = null;
             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),
-                            properties: {
-                                blockButton: true,
-                                label: action.title || actionName,
-                                icon: action.icon,
-                                tooltip: action.description
-                            }
-
-                        };
-                    }
-                }
-            }
-
+
+            var actions = objectFuns.map(userActions||{},function(action,actionName){
+                return {
+                    callback: action.callback &&
+                              lang.hitch(this,this._onSelectedAction,
+                                         action.callback),
+                    properties: {
+                        blockButton: true,
+                        label: action.title || actionName,
+                        icon: action.icon,
+                        tooltip: action.description
+                    }
+
+                };
+            }, this);
             this._titleLine = new LineWithActionsWidget({
                 title: this.title,
@@ -205 +199 @@
         },
         _createLineNode: function(item) {
-            var actions = {};
             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,this),
-                            properties: {
-                                blockButton: false,
-                                showLabel: false,
-                                icon: action.icon + " black",
-                                tooltip: action.description
-                            }
-                        };
-                    }
-                }
-            }
+            var actions = objectFuns.map(userActions||{},function(action,actionName){
+                return {
+                    callback: action.callback &&
+                              lang.partial(action.callback,item,this),
+                    properties: {
+                        blockButton: false,
+                        showLabel: false,
+                        icon: action.icon + " black",
+                        tooltip: action.description
+                    }
+                };
+            }, this);
             var w = new LineWithActionsWidget({
                 title: get(this.itemTitle,item),