Changeset 338 for Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidgetThijs.js

Timestamp:

06/04/12 16:18:24 (13 years ago)

Author:

tjcschipper

Message:

• Changed linewithactions and selector -options- property to -modifiers-: more general approach. These extra classes are applied to the root domNode of the widget during the postCreate phase instead.
• Changed rftSelector.css stuff to match this change, and allow for separate colouring of a selector and its contents.

File:

• Dev/branches/rest-dojo-ui/client/rft/ui/LineWithActionsWidgetThijs.js (modified) (4 diffs)

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/on','dojo/dom','dijit/form/Button',
+define(['dojo/_base/declare','dojo/_base/lang','dojo/on','dojo/dom', 'dojo/dom-class', 'dijit/form/Button',
     'dijit/_WidgetBase','dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin',
     'dojo/text!./templates/LineWithActionsWidget.html'
 ],
-    function(declare,lang,on,dom,Button,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString){
+    function(declare,lang,on,dom,domClass,Button,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString){
         return declare('rft.ui.LineWithActionsWidgetThijs',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
             templateString: templateString,
             baseClass: 'rftLineWithButtons',
             title: '',
-            color: "blue",
+            modifiers: "red",
             userObject: null,
             actions: {},
@@ -18 +18 @@
                 this.inherited(arguments);
                 this._setupActions();
+                domClass.add(this.domNode, this.modifiers);
                 this.refresh();
             },
@@ -24 +25 @@
                     
                     if (this.actions[action].properties.blockButton == true) {  // BlockButton
-                        new Button(
-                            lang.mixin({
-                                baseClass: 'rftBlockButton',
-                                "class": this.color,
-                                label: action,
-                                iconClass: 'rftIcon rftIcon'+action,
-                                title: action,
-                                onClick: lang.hitch(this, function(){
-                                    this.actions[action].callback(this.userObject);
-                                })
-                            }, this.actions[action].properties)).placeAt(this.buttonsNode);
+                        var properties = lang.mixin(
+                        {
+                            baseClass: 'rftBlockButton',
+                            modifiers: this.modifiers,
+                            label: action,
+                            iconClass: 'rftIcon rftIcon'+action,
+                            title: action,
+                            onClick: lang.hitch(this, function(){
+                                this.actions[action].callback(this.userObject);
+                            })
+                        },
+                        this.actions[action].properties);
+                        properties["class"] = properties.modifiers;
+                        
+                        new Button(properties).placeAt(this.buttonsNode);
                     } else {    //InlineButton
                         new Button(
@@ -48 +53 @@
                             }, this.actions[action].properties)).placeAt(this.buttonsNode);
                     }
-                    
-                    
-                    
-                /*  THIS USES DEPRECATED CLASSES!!!
-                    if (this.actions[action].blockButton == true) {    // BlockButton!
-                        new BlockButton({
-                            label: action,
-                            iconType: action,
-                            highlightColor: this.actions[action].color || "green",
-                            onClick: lang.hitch(this, function(){
-                                this.actions[action].callback(this.userObject);
-                            })
-                        }).placeAt(this.buttonsNode);
-                        
-                    } else {    // InlineButton!
-                        new InlineButton({
-                            label: action,
-                            iconType: action,
-                            highlightColor: "Black",
-                            onClick: lang.hitch(this, function(){
-                                this.actions[action].callback(this.userObject);
-                            })
-                        }).placeAt(this.buttonsNode);
-                    }
-                    */
                 }
             },