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

Timestamp:

03/09/14 22:03:19 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Removed all Coffeescript from codebase (build process is still there).
• Nicer message on failed login.
• Own all event subscriptions from widgets.
• Update objects in _ObjectPage with invalid info too, or our refresh will overwrite what user did.

Location:

Dev/trunk/src/client/qed-client

Files:

• . (modified) (1 prop)
• pages/index.js (modified) (1 diff)
• pages/question.js (modified) (2 diffs)
• pages/survey.js (modified) (1 diff)
• pages/surveyRun.js (modified) (2 diffs)

Dev/trunk/src/client/qed-client

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-session.js
-### end grunt-svn-ignore managed ignores

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-session.js
-### end grunt-svn-ignore managed ignores

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

@@ -15 +15 @@
             //this.btnContentCreate.on("click",function(){ Router.go("/sessions"); });
             //this.btnContentFacilitate.on("click",function(){ Router.go("/run"); });
-            this.btnSurveys.on("click",function(){
+            this.own(this.btnSurveys.on("click",function(){
                 Router.go(surveys.getCollectionPath());
-            });
-            this.btnQuestions.on("click",function(){
+            }));
+            this.own(this.btnQuestions.on("click",function(){
                 Router.go(questions.getCollectionPath());
-            });
+            }));
             //this.btnApplications.on("click",function(){Router.go("/applications");});
             //this.btnDashboards.on("click",function(){ Router.go("/dashboards"); });

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

@@ -19 +19 @@
             if ( this._started ) { return; }
             this.inherited(arguments);
-            this.propertiesForm.on('change',lang.hitch(this,'_handlePropertiesChange'));
-            this.contentList.on('change',lang.hitch(this,'_handleContentChange'));
+            this.own(this.propertiesForm.on('change',lang.hitch(this,'_handlePropertiesChange')));
+            this.own(this.contentList.on('change',lang.hitch(this,'_handleContentChange')));
             this._load();
         },
@@ -40 +40 @@
         _updateObject: function() {
             var pValid = this.propertiesForm.validate();
-            if ( pValid ) {
-                lang.mixin(this.object,this.propertiesForm.get('value'));
-            }
+            lang.mixin(this.object,this.propertiesForm.get('value'));
             var cValid = this.contentList.validate();
-            if ( cValid ) {
-                this.object.content = this.contentList.get('value');
-            }
+            this.object.content = this.contentList.get('value');
             this._isValid = pValid && cValid;
             return this._isValid;

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

@@ -23 +23 @@
             this._setupQuestionBrowser();
             this._setupListView();
-            this.questionList.on('change',lang.hitch(this,'_handleQuestionsChange'));
+            this.own(this.questionList.on('change',lang.hitch(this,'_handleQuestionsChange')));
             this._load();
         },

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

@@ -26 +26 @@
             if ( this._started ) { return; }
             this.inherited(arguments);
-            this.surveyRunWidget.on("change",lang.hitch(this,'_onPropChange'));
+            this.own(this.surveyRunWidget.on("change",lang.hitch(this,'_onPropChange')));
             this._load();
         },
@@ -98 +98 @@
         _updateObject: function() {
             this._isValid = this.surveyRunWidget.validate();
-            if ( this._isValid ) {
-                lang.mixin(this.object,this.surveyRunWidget.get('value'));
-            }
+            lang.mixin(this.object,this.surveyRunWidget.get('value'));
             return this._isValid;
         },

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-session.js
-### end grunt-svn-ignore managed ignores