Changeset 305 for Dev/branches/rest-dojo-ui/client

Timestamp:

03/06/12 13:07:13 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Client] Refactored AccordionList? as seperate widget.
[Server] Manually add namespaces to model, to prevent missing namespace errors.

Location:

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

Files:

• pages/questions.html (modified) (1 diff)
• pages/questions.js (modified) (2 diffs)
• ui/AccordionList.js (added)
• ui/QuestionWidget.js (modified) (1 diff)
• ui/templates/AccordionList.html (added)

Dev/branches/rest-dojo-ui/client/rft/pages/questions.html

@@ -2 +2 @@
     <h1>Questions</h1>
     <div data-dojo-type="dijit.form.Button" data-rft-attach-event="onClick:onNewQuestion">New question</div>
-    <div data-dojo-type="rft.ui.TitleGroup" data-rft-attach-point="accordion">
+    <div data-rft-attach-point="list">
     </div>
     <div data-dojo-type="dijit.Dialog" title="Question" data-rft-attach-point="questionDialog">

Dev/branches/rest-dojo-ui/client/rft/pages/questions.js

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/array','dojo/_base/event',
-    'dojo/_base/Deferred','dojo/dom-construct','rft/store','dijit/TitlePane',
-    'rft/ui/_Page','rft/ui/LineWithActionsWidget'],
-    function(declare,lang,array,event,Deferred,domConstruct,store,TitlePane,_Page,LineWithActionsWidget) {
+define(['dojo/_base/declare','dojo/_base/lang','dojo/_base/event',
+    'dojo/_base/Deferred','rft/store','rft/ui/_Page','rft/ui/AccordionList'],
+    function(declare,lang,event,Deferred,store,_Page,AccordionList) {
         return declare('rft.pages.questions',[_Page],{
             constructor: function() {
@@ -9 +8 @@
             },
             onVisit: function() {
-                this._store = store.getStore('Question');                
-                this._refresh(true);
+                this._store = store.getStore('Question');
+                this._list = new AccordionList({
+                    store: this._store,
+                    actions: {
+                        'Edit': lang.hitch(this,'_editQuestion')
+                    },
+                    categoryProperty: 'category',
+                    titleProperty: 'title'
+                },this.list);
+                this._list.startup();
+                this._refresh();
             },
-            _refresh: function(initial) {
-                Deferred.when( this._store.query() )
-                .then(lang.hitch(this,function(results){
-                    array.forEach(results,lang.hitch(this,'_addQuestion'));
-                    initial && this.accordion.selectChild(true);
-                }));
-            },
-            _addQuestion: function(q) {
-                var uid = q.getUid();
-                var question = this.questions[uid];
-                if ( !question ) {
-                    var qw = new LineWithActionsWidget({
-                        title: q.title,
-                        userObject: q,
-                        actions: {
-                            'Edit': lang.hitch(this,'_editQuestion')
-                        }
-                    });
-                    qw.startup();
-                    question = this.questions[uid] = {
-                        question: q,
-                        widget: qw
-                    }
-                } else {
-                    // update info
-                    question.question = q;
-                    question.widget.title = q.title;
-                    question.widget.userObject = q;
-                    question.widget.refresh();
-                }
-                var container = this._getContainerForQuestion(q);
-                question.widget.placeAt(container.containerNode);
-                this._cleanupEmptyContainers();
-            },
-            _getContainerForQuestion: function(q) {
-                var category = q.category || 'Unsorted';
-                var widgets = this.accordion.getChildren();
-                var containerWidget = null;
-                var placeNode = this.accordion.domNode;
-                var placePos = 'last';
-                array.some(widgets,lang.hitch(this,function(widget) {
-                    if ( widget.title == category ) {
-                        containerWidget = widget;
-                        return true;
-                    } else if ( widget.title > category  ) {
-                        placeNode = widget.domNode;
-                        placePos = "before";
-                        return true;
-                    }
-                    return false;
-                }));
-                if ( !containerWidget ) {
-                    containerWidget = new TitlePane({
-                        title:category
-                    });
-                    containerWidget.startup();
-                    domConstruct.place(containerWidget.domNode,placeNode,placePos);
-                }
-                return containerWidget;
-            },
-            _cleanupEmptyContainers: function() {
-                var widgets = this.accordion.getChildren();
-                array.forEach(widgets,lang.hitch(this,function(widget){
-                    if ( !widget.getChildren().length ) {
-                        this.accordion.removeChild(widget).destroy();
-                    }
-                }));
+            _refresh: function() {
+                this._list.refresh();
             },
             onNewQuestion: function() {

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

@@ -28 +28 @@
                 var value = this.ourForm.get('value');
                 lang.mixin(this.value,value);
-                return this._question;
+                return this.value;
             },
             _onTypeChange: function(type) {