Changeset 441 for Dev/trunk/client/qed/pages

Timestamp:

04/29/13 19:35:10 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Big cleanup of the question content.

• Replaced old list implementations with a new one that behaves like a form widget.
• All question content is now in separate widgets, not in the factory itself.
• Added form and widget validation for question editing.

Location:

Dev/trunk/client/qed/pages

Files:

• question.js (modified) (2 diffs)
• session.js (modified) (2 diffs)
• survey.js (modified) (4 diffs)
• templates/question.html (modified) (1 diff)

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

@@ -42 +42 @@
         _refresh: function () {
             this.titleNode.innerHTML = Question.DisplayTitle.get(this.question);
-            this._toolkit.set('value',this.question);
-            this._preview.appendItems(Question.Content.get(this.question));
+            this._toolkit.set('value', this.question);
+            this._preview.set('value', Question.Content.get(this.question));
         },
         _onSave: function(evt) {
-            lang.mixin(this.question, this._toolkit.get('value'));
-            Question.Content.set(this.question, this._preview.getItems());
-            store.put(this.question)
-            .then(function() {
-                Router.go('/questions');
-            },function(err){
-                Content.notify(err,'error');
-            });
+            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)
+                .then(function() {
+                    Router.go('/questions');
+                },function(err){
+                    Content.notify(err,'error');
+                });
+            }
             if ( evt ) { event.stop( evt ); }
             return false;
@@ -68 +70 @@
 
             this._preview = new QuestionEditorPreview({ 
-            },this.QuestionEditorPreviewNode);
+                name: 'content',
+                delay: 5,
+                region: 'center'
+            });
             this._preview.startup();
-            this._supportingWidgets.push(this._toolkit, this._preview);
+            this.addChild(this._preview);
         }
     });

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

@@ -51 +51 @@
         onSave: function(evt) {
             lang.mixin(this.session,this.propertiesForm.get('value'));
-            this.session.accounts = array.map(this._accountList.getItems(),function(item){
-                return store.getIdentity(item);
+            this.session.accounts = array.map(this._accountList.get('value'),
+                                              function(item){
+                                                  return store.getIdentity(item);
             });
             store.put(this.session)
@@ -71 +72 @@
         },
         _setupAccountList: function() {
-            this._accountList = new AccountListView().placeAt(this.accountListNode);
+            this._accountList = new AccountListView({
+                value: this.session.accounts
+            }).placeAt(this.accountListNode);
             this._accountList.startup();
-            for (var account in this.session.accounts) {
-                this._accountList.insertItem(this.session.accounts[account]);
-            }
         },
         _setupAutoComplete: function() {

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

@@ -55 +55 @@
         _setupListView: function() {
             this.questionList = new QuestionListView({
-                region: 'center'
+                region: 'center',
+                name: 'questions'
             },this.surveyListViewNode);
             this.questionList.startup();
@@ -67 +68 @@
                 .then(lang.hitch(this,function(survey){
                     this.survey = survey;
-                    array.forEach(Survey.Questions.get(this.survey),
-                        lang.hitch(this.questionList,'appendItem'));
+                    this.questionList.set('value',
+                                          Survey.Questions.get(this.survey));
                     this.refresh();
                 }));
@@ -74 +75 @@
         },
         _includeQuestion: function(question) {
-            this.questionList.insertItem(question);
+            this.questionList.appendItem(question);
         },
         refresh: function() {
@@ -97 +98 @@
         },
         _onSave: function(evt) {
-            this.survey.questions = this.questionList.getItems();
+            this.survey.questions = this.questionList.get('value');
             store.put(this.survey)
             .then(function() { 

Dev/trunk/client/qed/pages/templates/question.html

@@ -15 +15 @@
         </div>
     </div>
-    <div data-dojo-type="dijit/layout/ContentPane" data-dojo-props="region:'center'">
-        <div data-dojo-attach-point="QuestionEditorPreviewNode"></div>
-    </div>
 </div>