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

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

@@ -1 @@
-define(['dojo/_base/declare',
-    'dojo/_base/lang',
-    'dojo/on',
-    'dojo/dom',
-    'dojo/_base/event',
-    'dojo/dom-class',
-    'dijit/form/Button',
-    'dijit/_WidgetBase',
-    'dijit/_TemplatedMixin',
-    'dijit/_WidgetsInTemplateMixin',
-    'dojo/text!./templates/LineWithActionsWidget.html'
-],function(declare,lang,on,dom,event,domClass,Button,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString){
+define([
+    "../lib/object",
+    "dijit/_TemplatedMixin",
+    "dijit/_WidgetBase",
+    "dijit/_WidgetsInTemplateMixin",
+    "dijit/form/Button",
+    "dojo/_base/declare",
+    "dojo/_base/event",
+    "dojo/_base/lang",
+    "dojo/dom",
+    "dojo/dom-class",
+    "dojo/on",
+    "dojo/text!./templates/LineWithActionsWidget.html"
+], function(objectFuns, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, Button, declare, event, lang, dom, domClass, on, templateString) {
     return declare([_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
         templateString: templateString,
@@ -33 +35 @@
                 return;
             }
-            for (var action in this.actions) {
-                if ( this.actions.hasOwnProperty(action) ) {
-                    var properties;
-                    if (this.actions[action].properties.blockButton === true) {
-                        properties = lang.mixin({
-                            baseClass: 'rftBlockButton',
-                            label: "Default",
-                            iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
-                            title: this.actions[action].properties.tooltip,
-                            onClick: lang.hitch(this, function(action, e){
-                                if ( action.callback ) { action.callback(e); }
-                                if ( e ) { event.stop(e); }
-                                return false;
-                            }, this.actions[action])
-                        }, this.actions[action].properties);
-                        new Button(properties).placeAt(this.buttonsNode);
-                    } else {
-                        properties = lang.mixin({
-                            baseClass: 'rftInlineButton',
-                            label: "Default",
-                            showLabel: false,
-                            iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
-                            title: this.actions[action].properties.tooltip,
-                            onClick: lang.hitch(this, function(action, e){
-                                if ( action.callback ) { action.callback(e); }
-                                if ( e ) { event.stop(e); }
-                                return false;
-                            }, this.actions[action])
-                        }, this.actions[action].properties);
-                        new Button(properties).placeAt(this.buttonsNode);
-                    }
+            objectFuns.forEach(this.actions, function(value,action){
+                var properties;
+                if (value.properties.blockButton === true) {
+                    properties = lang.mixin({
+                        baseClass: 'rftBlockButton',
+                        label: "Default",
+                        iconClass: 'rftIcon rftIcon'+value.properties.icon,
+                        title: value.properties.tooltip,
+                        onClick: lang.hitch(this, function(action, e){
+                            if ( action.callback ) { action.callback(e); }
+                            if ( e ) { event.stop(e); }
+                            return false;
+                        }, value)
+                    }, value.properties);
+                    new Button(properties).placeAt(this.buttonsNode);
+                } else {
+                    properties = lang.mixin({
+                        baseClass: 'rftInlineButton',
+                        label: "Default",
+                        showLabel: false,
+                        iconClass: 'rftIcon rftIcon'+value.properties.icon,
+                        title: value.properties.tooltip,
+                        onClick: lang.hitch(this, function(action, e){
+                            if ( action.callback ) { action.callback(e); }
+                            if ( e ) { event.stop(e); }
+                            return false;
+                        }, value)
+                    }, value.properties);
+                    new Button(properties).placeAt(this.buttonsNode);
                 }
-            }
+            },this);
         },
         refresh: function() {