Changeset 442 for Dev/trunk/client/qed/pages/question.js

Timestamp:

05/02/13 13:13:13 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Enable validation on all fields of question.

File:

• Dev/trunk/client/qed/pages/question.js (modified) (3 diffs)

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

@@ -1 +1 @@
 define([
-    'dojo/_base/declare',
-    'dojo/_base/event',
-    'dojo/_base/lang',
-    'dojo/when',
-    '../store',
-    '../app/Content',
-    '../app/Router',
-    '../app/Page',
-    '../model/classes/Question',
-    '../model/widgets/QuestionEditorPreview',
-    '../model/widgets/QuestionEditorToolkit',
-    'dojo/text!./templates/question.html'
-],function(declare, event, lang, when, store, Content, Router, Page, Question, QuestionEditorPreview, QuestionEditorToolkit, template){
-    return declare([Page], {
+    "../app/Content",
+    "../app/Page",
+    "../app/Router",
+    "../model/classes/Question",
+    "../model/widgets/QuestionEditorPreview",
+    "../model/widgets/QuestionEditorToolkit",
+    "../store",
+    "../widgets/_ComplexValueMixin",
+    "dojo/_base/declare",
+    "dojo/_base/event",
+    "dojo/_base/lang",
+    "dojo/when",
+    "dojo/text!./templates/question.html"
+], function(Content, Page, Router, Question, QuestionEditorPreview, QuestionEditorToolkit, store, _ComplexValueMixin, declare, event, lang, when, template) {
+    return declare([Page,_ComplexValueMixin], {
         templateString: template,
-        question: null,
         _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);
+        },
         startup: function() {
             if ( this._started ) { return; }
@@ -25 +42 @@
                 throw new Error("Error: no reference to object set!");
             }
-            this._setupEditor();
             if (this.questionId === "new") {
-                this.question = Question.create();
-                this._refresh();
+                this.set('value', Question.create());
             } else {
                 when(store.get(this.questionId))
-                .then(lang.hitch(this, function(obj) {
-                    this.question = obj;
-                    this._refresh();
+                .then(lang.hitch(this, function(value) {
+                    this.set('value', value);
                 }));
             }
         },
-        onLeave: function() {
+        _setValueAttr: function(value) {
+            this.value = value;
             this.inherited(arguments);
+            this.titleNode.innerHTML = Question.DisplayTitle.get(value);
         },
-        _refresh: function () {
-            this.titleNode.innerHTML = Question.DisplayTitle.get(this.question);
-            this._toolkit.set('value', this.question);
-            this._preview.set('value', Question.Content.get(this.question));
+        _getValueAttr: function() {
+            var value = this.inherited(arguments);
+            lang.mixin(this.value, value);
+            return this.value;
         },
         _onSave: function(evt) {
-            if ( this._preview.validate() ) {
-                lang.mixin(this.question, this._toolkit.get('value'));
-                Question.Content.set(this.question, this._preview.get('value'));
-                store.put(this.question)
+            if ( this.validate() ) {
+                var value = this.get('value');
+                store.put(value)
                 .then(function() {
                     Router.go('/questions');
@@ -62 +77 @@
             Router.go('/questions');
             return true;
-        },
-        _setupEditor: function() {
-            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);
         }
     });