Changeset 510 for Dev/trunk/src/client/qed-client/widgets/ObjectBox.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/ObjectBox.js (modified) (2 diffs)

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dojo/_base/lang',
-    'dijit/_WidgetBase',
-    'dijit/_TemplatedMixin',
-    'dijit/_WidgetsInTemplateMixin',
-    './LineWithActionsWidget',
-    'dojo/text!./templates/ObjectBox.html'
-], function(declare, lang, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, LineWithActionsWidget, template){
+    "../lib/object",
+    "./LineWithActionsWidget",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/_WidgetsInTemplateMixin",
+    "dojo/_base/declare",
+    "dojo/_base/lang",
+    "dojo/text!./templates/ObjectBox.html"
+], function(objectFuns, LineWithActionsWidget, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, declare, lang, template) {
     return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
         baseClass: "rftObjectBox",
@@ -39 +40 @@
         },
         _createLine3Actions: function() {
-            var line3Actions = {};
-            for (var action in this.actions) {
-                if ( this.actions.hasOwnProperty(action) ) {
-                    line3Actions[action] = {
-                        callback: lang.hitch(this, function(callback){
-                            if ( this.value ) { callback(this.value); }
-                        }, this.actions[action]),
-                        properties: {
-                            blockButton: true,
-                            label: action,
-                            icon: action.charAt(0).toUpperCase()+action.slice(1)
-                        }
-                    };
-                }
-            }
-            return line3Actions;
+            return objectFuns.map(this.actions,function(value,name){
+                return {
+                    callback: lang.hitch(this, function(callback){
+                        if ( this.value ) { callback(this.value); }
+                    }, value),
+                    properties: {
+                        blockButton: true,
+                        label: name,
+                        icon: name.charAt(0).toUpperCase()+name.slice(1)
+                    }
+                };
+            },this);
         },
         _showInfoBox: function() {},