Changeset 501 for Dev/trunk/src/client/qed-client

Timestamp:

03/10/14 17:10:16 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Allow to specify all or only published questions.
• TabbedQuestionBrowser? respects include parameter again.
• Enable events in create() of ListWidget?.

Location:

Dev/trunk/src/client/qed-client

Files:

• model/widgets/TabbedQuestionBrowser.js (modified) (1 diff)
• widgets/ListWidget.js (modified) (6 diffs)

Dev/trunk/src/client/qed-client/model/widgets/TabbedQuestionBrowser.js

@@ -13 +13 @@
         dndType: "question",
         getCategories: function(){
-            return categories.query();
+            var opts = {};
+            if ( this.include ) { opts[this.include] = true; }
+            return categories.query(opts);
         },
         getCategoryName: function(category){ return category.name; },
         getCategoryCount: function(category){ return category.count; },
         getTopics: function(category) {
-            return topics.query({category:category.name});
+            var opts = {category:category.name};
+            if ( this.include ) { opts[this.include] = true; }
+            return topics.query(opts);
         },
         getTopicName: function(topic){ return topic.name; },
         getTopicCount: function(topic){ return topic.count; },
         getItems: function(category,topic) {
-            return questions.query({category:category.name,topic:topic.name})
-            .then(lang.hitch(this,function(items){
-                return array.filter(items, function(item){
-                    return (this.include === 'published' && item.publicationDate) ||
-                           (this.include === 'drafts' && !item.publicationDate) ||
-                           true;
-                }, this);
-            }));
+            var opts = {category:category.name,topic:topic.name};
+            if ( this.include ) { opts[this.include] = true; }
+            return questions.query(opts);
         },
         getItemName: function(item) {

Dev/trunk/src/client/qed-client/widgets/ListWidget.js

@@ -9 +9 @@
     "dojo/dnd/common",
     "dojo/dom-construct",
+    "dojo/_base/event",
     "dojo/on"
-], function(_Container, _WidgetBase, registry, array, declare, lang, Source, dnd, domConstruct, on) {
+], function(_Container, _WidgetBase, registry, array, declare, lang, Source, dnd, domConstruct, event, on) {
     return declare([_WidgetBase,_Container],{
         name: "",
@@ -58 +59 @@
                         lang.hitch(this,'_handleChange')));
         },
+        create: function() {
+            this.inherited(arguments);
+            this._onChangeActive = true;
+        },
         creator: function(item, hint) {
             var id = dnd.getUniqueId();
@@ -74 +79 @@
                 }
             }
-            this.own(on(nodeOrWidget,'change',lang.hitch(this,'_handleChange')));
+            //this.own(on(nodeOrWidget,'change',lang.hitch(this,'_handleChange')));
             var node = nodeOrWidget.domNode ? nodeOrWidget.domNode : nodeOrWidget;
             if ( hint !== "avatar" && node.id !== id ) {
@@ -122 +127 @@
         appendItems: function(items,forceEvent) {
             this.source.insertNodes(false,items);
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         appendItem: function(item,forceEvent) {
             this.source.insertNodes(false,[item]);
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         removeItem: function(key,forceEvent) {
@@ -133 +138 @@
             }), lang.hitch(this, "_destroyNodeOrWidget"));
             this.source.delItem(key);
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         getChildren: function() {
@@ -144 +149 @@
                           lang.hitch(this, "_destroyNodeOrWidget"));
             this.source.clearItems();
-            if ( forceEvent ) { this._handleChange(); }
+            if ( forceEvent ) { this._handleDrop(); }
         },
         _destroyNodeOrWidget: function(node) {