Changeset 493 for Dev/trunk/src/client/qed-client/pages

Timestamp:

03/09/14 19:25:40 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• _ComplexValueMixin propagates priorityChange to children.
• Deserialize updated docs after save too.
• Validate to false if definitions are missing.

Location:

Dev/trunk/src/client/qed-client/pages

Files:

• question.js (modified) (3 diffs)
• survey.js (modified) (1 diff)
• surveyRun.js (modified) (4 diffs)

Dev/trunk/src/client/qed-client/pages/question.js

@@ -25 +25 @@
         _refresh: function() {
             this.titleNode.innerHTML = this.object.title || "";
-            this.propertiesForm.set('value',this.object);
-            this.contentList.set('value',this.object.content);
+            this.propertiesForm.set('value',this.object,null);
+            this.contentList.set('value',this.object.content,null);
         },
         _handlePropertiesChange: function() {
-            lang.mixin(this.object,this.propertiesForm.get('value'));
+            this._updateObject();
             this.markDirty();
             this._refresh();
         },
         _handleContentChange: function() {
-            this.object.content = this.contentList.get('value');
+            this._updateObject();
             this.markDirty();
             this._refresh();
         },
+        _updateObject: function() {
+            var pValid = this.propertiesForm.validate();
+            if ( pValid ) {
+                lang.mixin(this.object,this.propertiesForm.get('value'));
+            }
+            var cValid = this.contentList.validate();
+            if ( cValid ) {
+                this.object.content = this.contentList.get('value');
+            }
+            this._isValid = pValid && cValid;
+            return this._isValid;
+        },
         _save: function() {
-            if ( this._isValid ) {
+            if ( this._updateObject() ) {
                 return this.inherited(arguments);
             } else {
@@ -65 +77 @@
         },
         markDirty: function() {
-            this._isValid = this.propertiesForm.validate() &&
-                            this.contentList.validate();
             this.saveBtn.set('disabled',!this._isValid);
             this.saveAndCloseBtn.set('disabled',!this._isValid);
@@ -73 +83 @@
         },
         markClean: function() {
-            this._isValid = true;
             this.saveBtn.set('disabled',true);
             this.saveAndCloseBtn.set('disabled',true);

Dev/trunk/src/client/qed-client/pages/survey.js

@@ -59 +59 @@
         _refresh: function() {
             this.titleNode.innerHTML = this.object.title || "(set title in properties)";
-            this.propertiesForm.set('value',{survey:this.object});
-            this.questionList.set('value',
-                                  this.object.questions);
+            this.propertiesForm.set('value',{survey:this.object},null);
+            this.questionList.set('value',this.object.questions,null);
         },
         _includeQuestion: function(question) {

Dev/trunk/src/client/qed-client/pages/surveyRun.js

@@ -22 +22 @@
         templateString: template,
         classStore: surveyRuns,
+        _isValid: false,
         startup: function() {
             if ( this._started ) { return; }
@@ -30 +31 @@
         _refresh: function() {
             this.titleNode.innerHTML = this.object.title || "";
-            this.surveySummaryWidget.set('value',this.object.survey);
-            this.surveyRunWidget.set('value',this.object);
+            this.surveySummaryWidget.set('value',this.object.survey,null);
+            this.surveyRunWidget.set('value',this.object,null);
             this._refreshURL();
             this._loadResponses();
@@ -96 +97 @@
         },
         _updateObject: function() {
-            var valid = this.surveyRunWidget.validate();
-            if ( valid ) {
+            this._isValid = this.surveyRunWidget.validate();
+            if ( this._isValid ) {
                 lang.mixin(this.object,this.surveyRunWidget.get('value'));
             }
-            return valid;
+            return this._isValid;
         },
         _onSave: function(evt) {
@@ -122 +123 @@
         },
         markDirty: function() {
-            this.saveBtn.set('disabled',false);
-            this.saveAndCloseBtn.set('disabled',false);
+            this.saveBtn.set('disabled',!this._isValid);
+            this.saveAndCloseBtn.set('disabled',!this._isValid);
             this.discardBtn.set('label','Discard & Close');
             this.inherited(arguments);