Changeset 392

Timestamp:

08/08/12 13:33:58 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Prevent duplication of questions on refresh in survey page.
Allow dragging by top bar only for QuestionEditorPreviewItems?.

Location:

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

Files:

• pages/survey.js (modified) (2 diffs)
• ui/QuestionEditorPreview.js (modified) (1 diff)
• ui/QuestionEditorPreviewItem.js (modified) (2 diffs)
• ui/lists/List.js (modified) (2 diffs)
• ui/templates/QuestionEditorPreviewItem.html (modified) (1 diff)

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

@@ -27 +27 @@
                     .then(lang.hitch(this,function(obj){
                         this.survey = obj;
+                        store.query(null,{keys:this.survey.questions,include_docs:true})
+                        .forEach(lang.hitch(this.questionList,'appendItem'));
                         this.refresh();
                     }));
@@ -66 +68 @@
                 this.titleNode.innerHTML = this.survey.title || "(set title in properties)";
                 this.propertiesForm.set('value',this.survey);
-                store.query(null,{keys:this.survey.questions,include_docs:true})
-                .forEach(lang.hitch(this.questionList,'appendItem'));
             },
             _onShowProperties: function(evt) {

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

@@ -10 +10 @@
             baseClass: 'surveyEditorPreview',
             type: 'questionContent',
+            withHandles: true,
 
             _createAvatarNode: function(item) {

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

@@ -46 +46 @@
                     this.innerWidget.startup();
                 }
-                this.titleNode.innerHTML = "[preview]";
+                this.titleNode.innerHTML = this.item.type+" [preview]";
             },
             _showEditWidget: function() {
@@ -55 +55 @@
                     this.innerWidget.startup();
                 }
-                this.titleNode.innerHTML = "[editing]";
+                this.titleNode.innerHTML = this.item.type+" [editing]";
             },
             onClose: function() {},

Dev/branches/rest-dojo-ui/client/rft/ui/lists/List.js

@@ -25 +25 @@
             removeCallback: null,
             type: 'text',
+            withHandles: false,
             source: null,
 
@@ -37 +38 @@
                     accept: [this.type],
                     singular: true,
+                    withHandles: this.withHandles,
                     creator: lang.hitch(this, this._createNode)
                 });

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

@@ -1 +1 @@
 <div class="inheritBgColor light">
-        <div class="topBorder inheritBgColor light" data-dojo-attach-point="topBorderNode">
+        <div class="topBorder inheritBgColor light dojoDndHandle" data-dojo-attach-point="topBorderNode">
                 <span class="title" data-dojo-attach-point="titleNode">Default title</span>
                 <span class="floatRight">