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

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)

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();
+            }
+        });
+    });