Changeset 370 for Dev/branches/rest-dojo-ui/client/rft/ui

Timestamp:

07/23/12 13:07:24 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Seperated question browser in TabbedQuestionBrowser? widget.
Made configuring Selector actions more flexible (both for top actions and item actions).
Fixed lowercase/uppercase problem in SurveyListView?.
Fixed whitespace and toolyip in LineWithActionsWidget?.
Added question browser to questions page. Removed the old dialog that was there and redirect to questionEditor page.

Location:

Dev/branches/rest-dojo-ui/client/rft/ui

Files:

• . (modified) (1 prop)
• LineWithActionsWidget.js (modified) (1 diff)
• QuestionEditorPreviewItem.js (modified) (2 diffs)
• Selector.js (modified) (5 diffs)
• SurveyListView.js (modified) (1 diff)
• TabbedQuestionBrowser.js (added)

Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidget.js

@@ -40 +40 @@
                                                         label: "Default",
                                                         iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
-                                                        title: action,
-                                                        onClick: lang.hitch(this, dojo.partial(function(ac, e){
-                                                                lang.hitch(this, this.actions[ac].callback )(e);
-                                                                event.stop(e);
-                                                                return false;
-                                                        }, action))
+                                                        title: this.actions[action].properties.tooltip,
+                            onClick: lang.hitch(this, function(action, e){
+                                action.callback && action.callback(e);
+                                event.stop(e);
+                                return false;
+                            }, this.actions[action])
                                                 }, this.actions[action].properties);
-                                                        properties["class"] = properties.modifiers;
-                                                        new Button(properties).placeAt(this.buttonsNode);
-                                                } else {
-                                                        properties = lang.mixin({
-                                                                baseClass: 'rftInlineButton',
-                                                                modifiers: 'black',
-                                                                label: "Default",
-                                                                showLabel: false,
-                                                                iconClass: 'rftIcon rftIcon'+this.actions[action].properties.icon,
-                                                                title: action,
-                                                                onClick: lang.hitch(this, dojo.partial(function(ac, e){
-                                                                        lang.hitch(this, this.actions[ac].callback)(e);
-                                                                        event.stop(e);
-                                                                        return false;
-                                                                }, action))
-                                                        }, this.actions[action].properties);
-                                                        properties["class"] = properties.modifiers;
-                                                        new Button(properties).placeAt(this.buttonsNode);
-                                                }
-                                        }
-                                },
-                                refresh: function() {
-                                        this.titleNode.innerHTML = this.title;
-                                },
-                                _onClick: function(e){
-                                        var preventDefault = this.onClick(e) === false;
-                                        if (preventDefault) {
-                                                event.stop(e);
-                                        }
-                                        return !preventDefault;
-                                },
-                                onClick: function(e) {
-                                },
-                                _setTitleAttr: function(value){
-                                        this.title = value;
-                                        this.refresh();
-                                }
-                        });
-});
+                        properties["class"] = properties.modifiers;
+                        new Button(properties).placeAt(this.buttonsNode);
+                    } else {
+                        properties = lang.mixin({
+                            baseClass: 'rftInlineButton',
+                            modifiers: 'black',
+                            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){
+                                action.callback && action.callback(e);
+                                event.stop(e);
+                                return false;
+                            }, this.actions[action])
+                        }, this.actions[action].properties);
+                        properties["class"] = properties.modifiers;
+                        new Button(properties).placeAt(this.buttonsNode);
+                    }
+                }
+            },
+            refresh: function() {
+                this.titleNode.innerHTML = this.title;
+            },
+            _onClick: function(e){
+                var preventDefault = this.onClick(e) === false;
+                if (preventDefault) {
+                    event.stop(e);
+                }
+                return !preventDefault;
+            },
+            onClick: function(e) {
+            },
+            _setTitleAttr: function(value){
+                this.title = value;
+                this.refresh();
+            }
+        });
+    });

Dev/branches/rest-dojo-ui/client/rft/ui/QuestionEditorPreviewItem.js

@@ -8 +8 @@
         'dijit/_TemplatedMixin',
         'dijit/_WidgetsInTemplateMixin',
-        'dijit/form/Textbox',
+        'dijit/form/TextBox',
         'dojo/text!./templates/QuestionEditorPreviewItem.html',
-        ], function(declare, fx, _WidgetBase, domClass, lang, on, _TemplatedMixin, _WidgetsInTemplateMixin, Textbox, templateFull) {
+        ], function(declare, fx, _WidgetBase, domClass, lang, on, _TemplatedMixin, _WidgetsInTemplateMixin, TextBox, templateFull) {
                 return declare("rft.ui.QuestionEditorPreviewItem", [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
 
@@ -70 +70 @@
                                 switch (this.item.widgetType) {
                                         default:
-                                        this.innerWidget = new Textbox();
+                                        this.innerWidget = new TextBox();
                                         break;
                                 }

Dev/branches/rest-dojo-ui/client/rft/ui/Selector.js

@@ -30 +30 @@
         return declare('rft.ui.Selector',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,_Container],{
             templateString: templateString,
-            title: "",
             baseClass: 'rftSelector',
             modifiers: 'blue',
+
+            title: "",
+            selectedActions: null,
+            itemActions: null,
+            // main selector action: Object
+            //    title:
+            //    description:
+            //    icon:
+
             _folded: true,
             _titleLine: null,
@@ -42 +50 @@
                 domClass.add(this.selectedColorNode, "pending");
 
+                this._createTitleLine();
+                this._createSelectorLine();
+
+                fx.wipeOut({
+                    node: this.optionsNode
+                }).play();
+            },
+            _createTitleLine: function() {
+                var actions = {};
+                var action = null;
+                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,
+                                 modifiers: this.modifiers,
+                                 label: action.title || actionName,
+                                 icon: action.icon,
+                                 tooltip: action.description
+                             }
+
+                        };
+                    }
+                }
+
                 this._titleLine = new LineWithActionsWidget({
                     title: this.title,
                     modifiers: this.modifiers,
-                    actions: {
-                        "Include in survey" : {
-                            callback: lang.hitch(this, this._onInclude),
-                            properties: {
-                                blockButton: true,
-                                modifiers: this.modifiers,
-                                icon: "Accept",
-                                label: "Include"
-                            }
-                        }
-                    }
+                    actions: actions
                 },this.titleNode);
                 this._titleLine.startup();
-
+            },
+            _createSelectorLine: function() {
                 this._selectorLine = new LineWithActionsWidget({
                     title: 'None',
@@ -76 +104 @@
                 this._selectorLine.startup();
                 this._selectorLine.on('click',lang.hitch(this, this.onToggle));
-
-                fx.wipeOut({
-                    node: this.optionsNode
-                }).play();
             },
             _onSelect: function(item, widget) {
@@ -97 +121 @@
                 this.onSelect(item);
             },
-            _onInclude: function() {
-                if (this._selectedItem) {
-                    this.onInclude(this._selectedItem);
+            _onSelectedAction: function(callback) {
+                if (this._selectedItem && callback) {
+                    callback(this._selectedItem);
                 }
             },
@@ -126 +150 @@
                 return false;
             },
+
             addItem: function(item) {
-                var w = new LineWithActionsWidget({
-                    title: item.title,
-                    actions: {
-                        "Info" : {
-                            callback: function() {
-                                item.description && alert(item.description);
-                            },
+                var actions = {};
+                var action;
+                if (this.itemActions) {
+                    for (var actionName in this.itemActions) {
+                        action = this.itemActions[actionName];
+                        actions[actionName] = {
+                            callback: function(){action.callback && action.callback(item);},
                             properties: {
                                 blockButton: false,
                                 showLabel: false,
-                                icon: "Inspect"
+                                icon: action.icon,
+                                tooltip: action.description
                             }
                         }
                     }
+                }
+                var w = new LineWithActionsWidget({
+                    title: item.title,
+                    actions: actions
                 }).placeAt(this.optionsNode);
                 w.startup();
                 w.on("click", lang.hitch(this, this._onSelect, item, w));
             },
-            onSelect: function(item) {},
-            onInclude: function(item) {}
+
+            onSelect: function(item) {}
         });
 });

Dev/branches/rest-dojo-ui/client/rft/ui/SurveyListView.js

@@ -110 +110 @@
                     node: node,
                     data: item,
-                    type: "SurveyListviewItem"
+                    type: "SurveyListViewItem"
                 };
                 return fullItem;