Changeset 513 for Dev/trunk/src/client/qed-client/model

Timestamp:

03/13/14 22:21:55 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Another shot at getting change events right for _ComplexValueMixin. Our previous approach made it impossible to detect if a change was cause during startup. Now we work purely with widget 'change' events. Children are connected during postCreate, addChild. If you add children otherwise you need to call connectChildsChanges yourself. Also to make sure events are generated, use _setValueInternal if you really need to set the value attribute yourself.
• Removed unused widget.

Location:

Dev/trunk/src/client/qed-client/model/widgets

Files:

• QuestionEditorPreviewItem.js (modified) (3 diffs)
• SurveyRenderWidget.js (modified) (1 diff)
• SurveyRunWidget.js (modified) (1 diff)
• templates/QuestionEditorToolkit.html (modified) (1 diff)
• templates/SurveyRunWidget.html (modified) (1 diff)

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

@@ -44 +44 @@
             return false;
         },
-        _getValueAttr: function(value) {
+        _getValueAttr: function() {
             if ( this._editing === true ) {
-                this.value = this.innerWidget.get('value');
+                return this.innerWidget.get('value');
             }
             return this.value;
         },
-        _setValueAttr: function(value) {
-            this.value = value;
+        _setValueAttr: function(value,priorityChange) {
+            this._setValueInternal(value,priorityChange);
             if ( this._editing  === true ) {
                 this._showEditWidget();
@@ -97 +97 @@
             if ( this._editing === true ) {
                 if (!this.innerWidget.validate || this.innerWidget.validate() ) {
-                    this.value = this.innerWidget.get('value');
+                    this._setValueInternal(this.innerWidget.get('value'));
                     this._showViewWidget();
                 }
@@ -149 +149 @@
             if ( this.innerWidget !== null ) {
                 if ( this._editing === true ) {
-                    this.triggerOnChange();
+                    this._onChange();
+                    // how to force event on widget here?
                 }
                 this.removeChild(this.innerWidget);

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

@@ -38 +38 @@
                 lang.mixin(newValue,widget.get('value'));
             },this);
-            this.value = newValue;
-            return this.value;
+            return newValue;
         },
-        _setValueAttr: function(value) {
+        _setValueAttr: function(value,priorityChange) {
+            this._setValueInternal(value,priorityChange);
             array.forEach(this._getDescendantFormWidgets(),function(widget){
                 widget.set('value',value);
             },this);
-            this.value = value;
         }
     });

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

@@ -14 +14 @@
             }));
         },
-        startup: function() {
-            this.inherited(arguments);
-        },
         _getValueAttr: function() {
             var value = this.inherited(arguments);

Dev/trunk/src/client/qed-client/model/widgets/templates/QuestionEditorToolkit.html

@@ -6 +6 @@
                 <label>Code:</label><input data-dojo-type="dijit/form/ValidationTextBox" required="required" name="code"/>
                 <label>Categories:</label>
-                <div data-dojo-attach-point="categoryListNode" class="rftLineListView"></div> 
+                <div data-dojo-attach-point="categoryListNode" class="rftLineListView"></div>
                 <div data-dojo-attach-point="categoryBoxNode"></div>
                 <button class="inheritBgColor" data-dojo-type="dijit/form/Button" data-dojo-attach-event="onClick:_onCategoryAdd" data-dojo-props="baseClass:'rftBlockButton', iconClass: 'rftIcon rftIconPlus'">Add</button><br/>

Dev/trunk/src/client/qed-client/model/widgets/templates/SurveyRunWidget.html

@@ -3 +3 @@
     <div>
         <label for="mode" class="qedLabel">Title</label>
-        <textarea name="title" class="qedField"
-                  data-dojo-props="required: true"
-                  data-dojo-type="dijit/form/ValidationTextBox"></textarea>
+        <div name="title" class="qedField"
+             data-dojo-props="required: true"
+             data-dojo-type="dijit/form/ValidationTextBox"></div>
     </div>
 
     <div>
         <label for="mode" class="qedLabel">Description</label>
-        <textarea name="description" class="qedField"
-                  data-dojo-type="dijit/form/Textarea"></textarea>
+        <div name="description" class="qedField"
+             data-dojo-type="dijit/form/Textarea"></div>
     </div>
 
     <div>
         <label for="startDate" class="qedLabel">Start date</label>
-        <input type="text" name="startDate" class="qedField"
-               data-dojo-type="dijit/form/DateTextBox"
-               data-dojo-attach-point="startDateBox" />
+        <div name="startDate" class="qedField"
+             data-dojo-type="dijit/form/DateTextBox"
+             data-dojo-attach-point="startDateBox"></div>
     </div>
 
     <div>
         <label for="endDate" class="qedLabel">End date</label>
-        <input type="text" name="endDate" class="qedField"
-               data-dojo-type="dijit/form/DateTextBox"
-               data-dojo-attach-point="endDateBox" />
+        <div name="endDate" class="qedField"
+             data-dojo-type="dijit/form/DateTextBox"
+             data-dojo-attach-point="endDateBox"></div>
     </div>
 
     <div>
         <label for="endDate" class="qedLabel">Allow respondents to delete their unsubmitted response</label>
-        <input type="text" name="respondentCanDeleteOwnResponse"
-               class="qedField"
-               data-dojo-type="dijit/form/CheckBox" />
+        <div type="text" name="respondentCanDeleteOwnResponse"
+             class="qedField"
+             data-dojo-type="dijit/form/CheckBox"></div>
     </div>
 
     <div>
         <label for="mode" class="qedLabel">Mode</label>
-        <select name="mode" class="qedField" data-dojo-type="dijit/form/Select">
+        <div name="mode" class="qedField" data-dojo-type="dijit/form/Select">
             <option value="open" selected="selected">Open</option>
             <option value="closed">Closed</option>
-        </select>
+        </div>
     </div>