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

Timestamp:

07/29/12 16:04:45 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Changed questions view to return null for empty topic/categorie and leave presentation of null to TabbedQuestionWidget?.

Location:

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

Files:

• pages/survey.js (modified) (1 diff)
• ui/TabbedQuestionBrowser.js (modified) (3 diffs)
• ui/_Page.js (modified) (4 diffs)

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

@@ -60 +60 @@
                 this.questionList = new QuestionListView({
                     region: 'center'
-                }).placeAt(this.surveyListViewNode);
+                },this.surveyListViewNode);
                 this.questionList.startup();
             },

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

@@ -20 +20 @@
             _busyCount: 0,
             constructor: function(){
+                this.inherited(arguments);
                 this._dataMap = {};
             },
             startup: function() {
+                this.inherited(arguments);
                 this._busyWidget = new Standby({
                     target: this.domNode,
@@ -40 +42 @@
                     var categoryTab = new ContentPane({
                         __category: category,
-                        title: category+" ("+count+")"
+                        title: (category || '[No category]')+" ("+count+")"
                     });
                     categoryTab.startup();
@@ -68 +70 @@
                         __category: category,
                         __topic: topic,
-                        title: topic+" ("+count+")",
+                        title: (topic || '[No topic]')+" ("+count+")",
                         selectedActions: this.selectedActions,
                         itemActions: this.itemActions

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/lang','dojo/parser','dojo/query',
-    'dojo/dom-attr','dijit','dijit/_WidgetBase'],
-    function(declare,lang,parser,query,attr,dijit,_WidgetBase){
-        return declare('rft.ui._Page',[_WidgetBase],{
+define([
+    'dojo/_base/declare',
+    'dojo/_base/lang',
+    'dojo/dom-attr',
+    'dojo/parser',
+    'dojo/query',
+    'dijit/layout/ContentPane',
+    'dijit/registry'
+    ],function(declare,lang,attr,parser,query,ContentPane,registry){
+        return declare('rft.ui._Page',[ContentPane],{
             startup: function() {
                 this.inherited(arguments);
@@ -11 +17 @@
                 query('*[data-rft-attach-point]'/*, this.domNode*/).forEach(lang.hitch(this,function(node){
                     var point = attr.get(node,'data-rft-attach-point');
-                    var widget = dijit.byId(attr.get(node,'id'));
+                    var widget = registry.byId(attr.get(node,'id'));
                     this[point] = widget || node;
                 }));
@@ -18 +24 @@
                     var eventName = event[0];
                     var eventHandler = event[1];
-                    var widget = dijit.byId(attr.get(node,'id'));
+                    var widget = registry.byId(attr.get(node,'id'));
                     if ( widget ) {
                         this.connect(widget,eventName,lang.hitch(this,eventHandler));
@@ -36 +42 @@
             /** Event fired before leaving the page. Return false to prevent */
             onLeave: function(){
-                dijit.findWidgets(this.domNode).forEach(function(w){
+                registry.findWidgets(this.domNode).forEach(function(w){
                     w.destroyRecursive(false);
                 });