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

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/pages

Files:

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

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

@@ -22 +22 @@
         _load: function() {
             if ( this.object ) {
-                this._refresh();
+                this._refresh(true);
             } else if ( this.objectId ) {
                 if ( this.objectId === "new" ) {
                     this.object = this.classStore.create();
-                    this._refresh();
+                    this.markDirty();
+                    this._refresh(true);
                 } else {
                     this.classStore.load(this.objectId)
-                    .then(lang.hitch(this,'_setObject'),
-                          lang.hitch(this,function(err){
-                                this.die(err.error);
-                            }));
+                    .then(lang.hitch(this,function(object){
+                        this._setObject(object,true);
+                    }),lang.hitch(this,function(err){
+                        this.die(err.error);
+                    }));
                 }
             } else {
-                this.die("No valid uid or object passed!");
+                this.die("No valid id or object passed!");
             }
         },
-        _setObject: function(object) {
+        _setObject: function(object,initial) {
             this.object = object;
             if ( this.objectId === "new" ) {
                 this.go(this.classStore.getObjectPath(this.object),{},true);
             }
-            this._refresh();
+            this.markClean();
+            this._refresh(initial);
         },
-        _refresh: function() {},
+        _refresh: function(initial) {},
         _save: function() {
             return this.classStore.save(this.object)
             .then(lang.hitch(this,function(object){
-                this.markClean();
                 this._setObject(object);
                 this.notify(this.classStore.getName()+" successfully saved.");

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

@@ -23 +23 @@
             this._load();
         },
-        _refresh: function() {
-            this.propertiesForm.set('value',this.object,null);
-            this.contentList.set('value',this.object.content,null);
-            this._internalRefresh();
-        },
-        _internalRefresh: function(){
+        _refresh: function(initial) {
+            if ( initial === true ) {
+                this.propertiesForm.set('value',this.object,null);
+                this.contentList.set('value',this.object.content,null);
+            }
             this.titleNode.innerHTML = this.object.title || "";
         },
@@ -34 +33 @@
             this._updateObject();
             this.markDirty();
-            this._internalRefresh();
+            this._refresh();
         },
         _handleContentChange: function() {
             this._updateObject();
             this.markDirty();
-            this._internalRefresh();
+            this._refresh();
         },
         _updateObject: function() {

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

@@ -61 +61 @@
             this.questionList.startup();
         },
-        _refresh: function() {
-            this.propertiesForm.set('value',{survey:this.object},null);
-            this.questionList.set('value',this.object.questions,null);
-            this._internalRefresh();
-        },
-        _internalRefresh: function() {
+        _refresh: function(initial) {
+            if ( initial === true ) {
+                this.propertiesForm.set('value',{survey:this.object},null);
+                this.questionList.set('value',this.object.questions,null);
+            }
             this.titleNode.innerHTML = this.object.title || "(set title in properties)";
         },
@@ -75 +74 @@
             this.object.questions = this.questionList.get('value');
             this.markDirty();
-            this._internalRefresh();
+            this._refresh();
         },
         _onShowProperties: function(evt) {
@@ -86 +85 @@
             lang.mixin(this.object, this.propertiesForm.get('value').survey);
             this.markDirty();
-            this._internalRefresh();
+            this._refresh();
             if ( evt ) { event.stop(evt); }
             return false;

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

@@ -29 +29 @@
             this._load();
         },
-        _refresh: function() {
-            this.surveySummaryWidget.set('value',this.object.survey,null);
-            this.surveyRunWidget.set('value',this.object,null);
-            this._internalRefresh();
-            this._loadResponses();
-        },
-        _internalRefresh: function() {
+        _refresh: function(initial) {
+            if ( initial === true ) {
+                this.surveySummaryWidget.set('value',this.object.survey,null);
+                this.surveyRunWidget.set('value',this.object,null);
+                this._loadResponses();
+            }
             this.titleNode.innerHTML = this.object.title || "";
             if ( this.object.mode === "open" ) {
@@ -77 +76 @@
             this._updateObject();
             this.markDirty();
-            this._internalRefresh();
+            this._refresh();
         },
         _buildGeneralURL: function(surveyRun) {