Changeset 490 for Dev/trunk/src/client/qed-client/pages/question.js

Timestamp:

03/08/14 22:51:23 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Mark content as dirty to prevent moving away from unsaved data.
• Better change propagation from lists and our own widgets.
• Generate notifications for errors and show correct message.
• Moved all path/url generation to the class stores, not everywhere we use it.
• Give user always a choice between Save and Save & Close.
• Better refresh behaviour on form changes and saves.
• Don't generate duplicate code error when existing object is the one you're storing.

File:

• Dev/trunk/src/client/qed-client/pages/question.js (modified) (1 diff)

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

@@ -1 +1 @@
 define([
-    "../app/Content",
-    "../app/Page",
     "../app/Router",
     "../model/classes/questions",
-    "../model/widgets/QuestionEditorPreview",
-    "../model/widgets/QuestionEditorToolkit",
-    "../widgets/_ComplexValueMixin",
+    "./_ObjectPage",
+    "dojo/Deferred",
     "dojo/_base/declare",
     "dojo/_base/event",
     "dojo/_base/lang",
-    "dojo/when",
+    "require",
     "dojo/text!./templates/question.html"
-], function(Content, Page, Router, questions, QuestionEditorPreview, QuestionEditorToolkit, _ComplexValueMixin, declare, event, lang, when, template) {
-    return declare([Page,_ComplexValueMixin], {
+], function(Router, questions, _ObjectPage, Deferred, declare, event, lang, require, template) {
+    return declare([_ObjectPage], {
+        contextRequire: require,
         templateString: template,
         _toolkit: null,
         _preview: null,
-        value: null,
-        
-        buildRendering: function() {
-            this.inherited(arguments);
-
-            this._toolkit = new QuestionEditorToolkit({
-            },this.QuestionEditorToolkitNode);
-            this._toolkit.on('submit',lang.hitch(this,"_onSave"));
-            this._toolkit.startup();
-
-            this._preview = new QuestionEditorPreview({ 
-                name: 'content',
-                delay: 5,
-                region: 'center'
-            });
-            this._preview.startup();
-            this.addChild(this._preview);
-        },
+        classStore: questions,
         startup: function() {
             if ( this._started ) { return; }
             this.inherited(arguments);
-            if ( !this.questionId ) {
-                throw new Error("Error: no reference to object set!");
+            this.propertiesForm.on('change',lang.hitch(this,'_handlePropertiesChange'));
+            this.contentList.on('change',lang.hitch(this,'_handleContentChange'));
+            this._load();
+        },
+        _refresh: function() {
+            this.titleNode.innerHTML = this.object.title || "";
+            this.propertiesForm.set('value',this.object);
+            this.contentList.set('value',this.object.content);
+        },
+        _handlePropertiesChange: function() {
+            if ( this.propertiesForm.validate() ) {
+                lang.mixin(this.object,this.propertiesForm.get('value'));
             }
-            if (this.questionId === "new") {
-                this.set('value', questions.create());
+            this.markDirty();
+        },
+        _handleContentChange: function() {
+            if ( this.contentList.validate() ) {
+                this.object.content = this.contentList.get('value');
+            }
+            this.markDirty();
+        },
+        _save: function() {
+            if ( this.propertiesForm.validate() && this.contentList.validate() ) {
+                lang.mixin(this.object,this.propertiesForm.get('value'));
+                this.object.content = this.contentList.get('value');
+                return this.inherited(arguments);
             } else {
-                when(questions.load(this.questionId))
-                .then(lang.hitch(this, function(value) {
-                    this.set('value', value);
-                }));
+                return new Deferred().reject();
             }
         },
-        _setValueAttr: function(value) {
-            this.value = value;
-            this.inherited(arguments);
-            this.titleNode.innerHTML = value.title || "";
-        },
-        _getValueAttr: function() {
-            var value = this.inherited(arguments);
-            lang.mixin(this.value, value);
-            return this.value;
-        },
         _onSave: function(evt) {
-            if ( this.validate() ) {
-                questions.save(this.get('value'))
-                .then(function() {
-                    Router.go('/questions');
-                },function(err){
-                    Content.notify(err,'error');
-                });
-            }
+            this._save();
             if ( evt ) { event.stop( evt ); }
             return false;
         },
-        _onDiscard: function() {
-            Router.go('/questions');
-            return true;
+        _onSaveAndClose: function(evt) {
+            this._save()
+            .then(function(){
+                Router.go(questions.getCollectionPath());
+            });
+            if ( evt ) { event.stop( evt ); }
+            return false;
+        },
+        _onDiscard: function(evt) {
+            this.markClean();
+            Router.go(questions.getCollectionPath());
+            if ( evt ) { event.stop( evt ); }
+            return false;
+        },
+        _ignore: function(evt) {
+            if ( evt ) { event.stop( evt ); }
+            return false;
         }
     });