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

Timestamp:

07/27/12 14:52:36 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Added description to survey properties form.
• Added crude loading indicator to TabbedQuestionWidget?.
• Organized run.js: dependencies in alpha order and only declaratively used widgets, removed other dependencies, they should be in the modules where they are used.
• ElasticReadStore? and ElasticSearchFilteringSelect? was a mix of old dojo.declare/dojo.require and new AMD style. Changed it completely to AMD style (benefits builds later as well).
• Changed questions view so questions without topics/categories show up as well in the view.

File:

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

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

@@ -2 +2 @@
     'dojo/_base/declare',
     'dojo/_base/lang',
+    'dojo/_base/window',
     'dijit/layout/ContentPane',
     'dijit/layout/TabContainer',
+    'dojox/widget/Standby',
     'rft/store',
     'rft/ui/Selector',
     'dojo/domReady!'
     ],
-    function(declare,lang,ContentPane,TabContainer,store,Selector){
+    function(declare,lang,win,ContentPane,TabContainer,Standby,store,Selector){
         return declare('rft.ui.TabbedQuestionBrowser',[TabContainer],{
             tabPosition: 'left-h',
@@ -16 +18 @@
 
             _dataMap: null,
+            _busyCount: 0,
             constructor: function(){
                 this._dataMap = {};
             },
             startup: function() {
+                this._busyWidget = new Standby({
+                    target: this.domNode,
+                    duration: 200
+                }).placeAt(win.body());
+                this._busyWidget.startup();
                 this.watch("selectedChildWidget",lang.hitch(this,function(name,oldTab,newTab){
                     this._fillCategoryTab(newTab.__category);
@@ -44 +52 @@
                 var categoryMap = this._dataMap[category];
                 if (!categoryMap._filled) {
+                    this._busy();
                     categoryMap._filled = true;
                     store.query('_design/default/_view/questions', {reduce:true,group:true,group_level:2,startkey:[category],endkey:[category,{}]})
                     .forPairs(lang.hitch(this,function(value,key){
                         this._createTopicSelector(key[1],category,value);
+                    })).then(lang.hitch(this,function(){
+                        this._done();
                     }));
                 }
@@ -73 +84 @@
                 var topicMap = categoryMap[topic];
                 if (!topicMap._filled) {
+                    topicMap._filled = true;
+                    this._busy();
                     store.query('_design/default/_view/questions', {reduce:false,include_docs:true,key:[category,topic]})
                     .forEach(lang.hitch(this,function(value){
                         topicMap._widget.addItem(value);
+                    })).then(lang.hitch(this,function(){
+                        this._done();
                     }));
+                }
+            },
+            _busy: function() {
+                if ( this._busyCount === 0 ) {
+                    this._busyWidget.show();
+                }
+                this._busyCount++;
+            },
+            _done: function() {
+                if ( this._busyCount > 0 ) {
+                    this._busyCount--;
+                    if ( this._busyCount === 0 ) {
+                        this._busyWidget.hide();
+                    }
+                } else {
+                    console.warn('Busycount <= 0 when _done is called.');
                 }
             },