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

Timestamp:

03/10/14 16:07:00 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Indicate of refresh is due to load or due to save in _ObjectPage.
• _ComplexValueMixin & ListWidget? catch all change events and drops them if still being created.

Location:

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

Files:

• QuestionEditorPreviewItem.js (modified) (5 diffs)
• questions/MultipleChoiceInputWidget.js (modified) (1 diff)
• templates/QuestionEditorPreviewItem.html (modified) (2 diffs)

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

@@ -1 +1 @@
 define([
+    "../../widgets/_ComplexValueWidget",
     "./questions/Factory",
     "dijit/_Container",
@@ -14 +15 @@
     "dojo/on",
     "dojo/text!./templates/QuestionEditorPreviewItem.html"
-], function(QuestionWidgetFactory, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, declare, event, fx, lang, domClass, domGeom, domStyle, on, template) {
-    return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container], {
+], function(_ComplexValueWidget, QuestionWidgetFactory, _Container, _TemplatedMixin, _WidgetBase, _WidgetsInTemplateMixin, declare, event, fx, lang, domClass, domGeom, domStyle, on, template) {
+    return declare([_ComplexValueWidget], {
         templateString: template,
         baseClass: "qedQuestionEditorPreviewItem",
@@ -87 +88 @@
                 this._destroyInnerWidget();
                 this.innerWidget = newWidget;
-                this.innerWidget.placeAt(this.containerNode);
-                this.innerWidget.startup();
+                this.addChild(this.innerWidget);
                 this.innerWidget.set('readOnly',true);
                 this.titleNode.innerHTML = this.value.type+" [preview]";
@@ -101 +101 @@
                 this._destroyInnerWidget();
                 this.innerWidget = newWidget;
-                this.innerWidget.placeAt(this.containerNode);
-                this.innerWidget.startup();
+                this.addChild(this.innerWidget);
                 this.titleNode.innerHTML = this.value.type+" [editing]";
                 domClass.replace(this.editButton.iconNode, "rftIconAccept", "rftIconEdit");
@@ -111 +110 @@
         _destroyInnerWidget: function() {
             if ( this.innerWidget !== null ) {
+                this.removeChild(this.innerWidget);
                 this.innerWidget.destroyRecursive();
+                this.innerWidget = null;
             }
         },

Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputWidget.js

@@ -32 +32 @@
         _getValueAttr: function() {
             var value = this.inherited(arguments);
-            if ( this.allowMultiple === true ) {
+            /*if ( this.allowMultiple === true ) {
                 return value;
             } else {
-                return value.choice.length > 0;
-            }
+                return value.choice; //.length > 0;
+            }*/
         },
         _setValueAttr: function(value) {

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

@@ -1 @@
-<div>
+<form>
         <div class="topBorder inheritBgColor bg dojoDndHandle">
                 <span class="title" data-dojo-attach-point="titleNode">Default title</span>
@@ -13 +13 @@
                 </div>
         </div>
-</div>
+</form>