Changeset 510 for Dev/trunk/src/client/qed-client/widgets

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).

Location:

Dev/trunk/src/client/qed-client/widgets

Files:

• LineWithActionsWidget.js (modified) (2 diffs)
• ObjectBox.js (modified) (2 diffs)
• Selector.js (modified) (4 diffs)
• TabbedBrowser.js (modified) (3 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() {

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() {},

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),

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

@@ -1 +1 @@
 define([
+    "../lib/object",
     "./Selector",
     "dijit/layout/ContentPane",
@@ -9 +10 @@
     "dojo/when",
     "dojox/widget/Standby"
-], function(Selector, ContentPane, TabContainer, array, declare, lang, win, when, Standby) {
+], function(objectFuns, Selector, ContentPane, TabContainer, array, declare, lang, win, when, Standby) {
     return declare([TabContainer],{
         tabPosition: 'left-h',
@@ -121 +122 @@
         removeItem: function(item) {
             var cmap = this._dataMap;
-            for ( var cat in cmap ) {
-                if ( cmap.hasOwnProperty(cat) ) {
-                    var tmap = cmap[cat];
-                    for ( var top in tmap ) {
-                        if ( tmap.hasOwnProperty(top) ) {
-                            var widget = tmap[top]._widget;
-                            if ( widget ) { widget.removeItem(item); }
-                        }
-                    }
-                }
-            }
+            objectFuns.forEach(cmap,function(tmap,cat){
+                objectFuns.forEach(tmap,function(topObj,top){
+                    var widget = topObj._widget;
+                    if ( widget ) { widget.removeItem(item); }
+                },this);
+            },this);
         },
         _busy: function() {