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

Timestamp:

03/23/12 17:26:55 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Mockup included.

Location:

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

Files:

• AccordionList.js (modified) (2 diffs)
• LineWithActionsWidget.js (modified) (2 diffs)
• List.js (added)
• Selector.js (added)
• templates/LineWithActionsWidget.html (modified) (1 diff)
• templates/List.html (added)
• templates/Selector.html (added)

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

@@ -9 +9 @@
         return declare('rft.ui.AccordionList',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
             templateString: template,
-            store: null,
             idProperty: null,
             categoryProperty: null,
@@ -18 +17 @@
                 this._widgets = {};
             },
-            postCreate: function() {
-                this.idProperty = this.idProperty || this.store.idProperty;
-                this.refresh(true);
-            },
-            refresh: function(initial) {
-                Deferred.when( this.store.query() )
-                .then(lang.hitch(this,'_addItems',initial));
-            },
-            _addItems: function(initial,items) {
-                var newWidgets = {};
-                array.forEach(this._widgets,domConstruct.destroy); // get everything out of the dom
-                array.forEach(items,lang.hitch(this,function(item){
-                    var widget = this._getWidgetForItem(item);
-                    var id = this._getItemProperty(this.idProperty,item);
-                    var container = this._getContainerForItem(item);
-                    widget.placeAt(container.containerNode);
-                    newWidgets[id] = widget;
-                }));
-                var oldWidgets = array.filter(this.items,function(widget){
-                    return array.indexOf(newWidgets,widget) < 0;
+            setItems: function(items) {
+                var obsoleteWidgets = array.filter(this.widgets,function(item){
+                    return array.indexOf(items,item) < 0;
                 });
-                array.forEach(oldWidgets,function(widget){
+                array.forEach(obsoleteWidgets,function(widget){
                     widget.destroy();
                 });
-                this._widgets = newWidgets; // overwrite, releasing any non-existing items
-                initial && this.accordion.selectChild(true);
+                array.forEach(this._widgets,domConstruct.destroy); // get everything out of the dom
+                array.forEach(items,lang.hitch(this,"_addItem"));
                 this._cleanupEmptyContainers();
+            },
+            addItems: function(items) {
+                array.forEach(items,lang.hitch(this,"_addItem"));
+                this._cleanupEmptyContainers();
+            },
+            addItem: function(item) {
+                this._addItem(item);
+                this._cleanupEmptyContainers();
+            },
+            _addItem: function(item) {
+                var widget = this._getWidgetForItem(item);
+                var container = this._getContainerForItem(item);
+                widget.placeAt(container.containerNode);
+            },
+            removeItem: function(item) {
+                var id = this._getItemProperty(this.idProperty,item);
+                var widget = this._getWidgetForItem(item);
+                widget && widget.destroy();
+                delete this._widgets[id];
             },
             _getWidgetForItem: function(item) {

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dijit/form/Button',
+define(['dojo/_base/declare','dojo/_base/lang','dojo/on','dojo/dom','dijit/form/Button',
     'dijit/_WidgetBase','dijit/_TemplatedMixin','dijit/_WidgetsInTemplateMixin',
     'dojo/text!./templates/LineWithActionsWidget.html'],
-    function(declare,lang,Button,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString){
+    function(declare,lang,on,dom,Button,_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin,templateString){
         return declare('rft.ui.LineWithActionsWidget',[_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],{
             templateString: templateString,
+            baseClass: 'rftLineWithButtons',
             title: '',
             userObject: null,
             actions: {},
+            postCreate: function() {
+                dom.setSelectable(this.domNode, false);
+                on(this.titleNode,'click',lang.hitch(this,'_onClick'));
+            },
             startup: function() {
                 this.inherited(arguments);
@@ -17 +22 @@
                     new Button({
                         label: action,
+                        //iconClass: 'dijitIconSearch',
+                        //showLabel: false,
                         onClick: lang.hitch(this,function(){
                             this.actions[action](this.userObject);
                         })
-                    }).placeAt(this.actionBar);
+                    }).placeAt(this.buttonsNode);
                 }
             },
             refresh: function() {
                 this.titleNode.innerHTML = this.title;
-            }
+            },
+            _onClick: function(e){
+                var preventDefault = this.onClick(e) === false;
+                if(preventDefault){
+                    e.preventDefault();
+                }
+                return !preventDefault;
+            },
+            onClick: function(e) {}
         });
     });

Dev/branches/rest-dojo-ui/client/rft/ui/templates/LineWithActionsWidget.html

@@ -1 @@
-<div>
-    <span data-dojo-attach-point="actionBar"></span>
-    <span data-dojo-attach-point="titleNode"></span>
+<div class="${baseClass}">
+    <span class="${baseClass}Title" data-dojo-attach-point="titleNode"></span>
+    <span class="${baseClass}Buttons" data-dojo-attach-point="buttonsNode"></span>
 </div>