Changeset 494

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

Files:

• client/qed-client (modified) (1 prop)
• client/qed-client/css/qed.less (modified) (1 diff)
• client/qed-client/css/ui/LoginDialog.less (added)
• client/qed-client/model/widgets/SurveyRunWidget.js (modified) (1 diff)
• client/qed-client/model/widgets/questions/MultipleChoiceInputConfigWidget.js (modified) (1 diff)
• client/qed-client/pages/index.js (modified) (1 diff)
• client/qed-client/pages/question.js (modified) (2 diffs)
• client/qed-client/pages/survey.js (modified) (1 diff)
• client/qed-client/pages/surveyRun.js (modified) (2 diffs)
• client/qed-client/session.coffee (deleted)
• client/qed-client/session.js (added)
• client/qed-client/ui (modified) (1 prop)
• client/qed-client/ui/LoginDialogWrapper.coffee (deleted)
• client/qed-client/ui/LoginDialogWrapper.js (added)
• client/qed-client/ui/SessionMenu.coffee (deleted)
• client/qed-client/ui/SessionMenu.js (added)
• client/qed-client/ui/templates/LoginDialogWrapper.html (modified) (1 diff)
• client/qed-client/widgets/LineWithActionsWidget.js (modified) (1 diff)
• client/qed-client/widgets/ListWidget.js (modified) (2 diffs)
• client/qed-client/widgets/Selector.js (modified) (2 diffs)
• server/util (modified) (1 prop)
• server/util/couch.coffee (deleted)
• server/util/couch.js (added)

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/css/qed.less

@@ -22 +22 @@
 @import "ui/MainMenu.less";
 @import "ui/topbar.less";
+@import "ui/LoginDialog.less";
 @import "widgets/MultipleChoiceWidget.less";
 @import "widgets/lists/List.less";

Dev/trunk/src/client/qed-client/model/widgets/SurveyRunWidget.js

@@ -9 +9 @@
         postCreate: function() {
             var endDateBox = this.endDateBox;
-            this.startDateBox.on('change', function(value){
+            this.own(this.startDateBox.on('change', function(value){
                 endDateBox.constraints.min  = value;
-            });
+            }));
         },
         _getValueAttr: function() {

Dev/trunk/src/client/qed-client/model/widgets/questions/MultipleChoiceInputConfigWidget.js

@@ -52 +52 @@
         _getValueAttr: function() {
             var value = this.inherited(arguments);
+            value.type = this.type;
             value.allowMultiple = value.allowMultiple.length > 0;
-            value.type = this.type;
             return value;
+        },
+        _setValueAttr: function(value) {
+            value.allowMultiple = value.allowMultiple ? ["on"] : [];
+            return this.inherited(arguments);
         },
         onAddItem: function(evt) {

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;
         },

Dev/trunk/src/client/qed-client/ui

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-LoginDialogWrapper.js
-SessionMenu.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
-LoginDialogWrapper.js
-SessionMenu.js
-### end grunt-svn-ignore managed ignores

Dev/trunk/src/client/qed-client/ui/templates/LoginDialogWrapper.html

@@ -23 +23 @@
                    data-dojo-props="required: true"></div>
             </div>
-            <div data-dojo-type="dijit/form/Button"
-                 type="submit"
-                 data-dojo-attach-event="onClick:onLogin">Login</div>
+            <div>
+                <div data-dojo-type="dijit/form/Button"
+                     type="submit"
+                     data-dojo-attach-event="onClick:onLogin">Login</div>
+                <div class="infoField"
+                     data-dojo-attach-point="infoNode"></div>
+            </div>
         </form>
     </div>

Dev/trunk/src/client/qed-client/widgets/LineWithActionsWidget.js

@@ -21 +21 @@
         postCreate: function() {
             dom.setSelectable(this.domNode, false); // Text selection, has nothing to do with object selection!
-            on(this.domNode,'click',lang.hitch(this,'_onClick'));
+            this.own(on(this.domNode,'click',lang.hitch(this,'_onClick')));
         },
         startup: function() {

Dev/trunk/src/client/qed-client/widgets/ListWidget.js

@@ -50 +50 @@
             });
             this.source = new this.container(this.domNode,sourceParams);
-            this.source.on('Drop',lang.hitch(this,'_handleChange'));
+            this.own(this.source.on('Drop',lang.hitch(this,'_handleChange')));
         },
         creator: function(item, hint) {
@@ -68 +68 @@
                 }
             }
-            on(nodeOrWidget,'change',lang.hitch(this,'_handleChange'));
+            this.own(on(nodeOrWidget,'change',lang.hitch(this,'_handleChange')));
             var node = nodeOrWidget.domNode ? nodeOrWidget.domNode : nodeOrWidget;
             if ( hint !== "avatar" && node.id !== id ) {

Dev/trunk/src/client/qed-client/widgets/Selector.js

@@ -105 +105 @@
             },this.selectedItemNode);
             this._selectorLine.startup();
-            this._selectorLine.on('click',lang.hitch(this, this.onToggle));
+            this.own(this._selectorLine.on('click',lang.hitch(this, 'onToggle')));
         },
         _createSource: function() {
@@ -210 +210 @@
             });
             w.startup();
-            w.on("click", lang.hitch(this, this._onSelect, item, w));
+            this.own(w.on("click", lang.hitch(this, '_onSelect', item, w)));
             return w.domNode;
         },

Dev/trunk/src/server/util

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-couch.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
-couch.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

@@ -1 +1 @@
 
-### begin grunt-svn-ignore managed ignores
-### edits will be overwritten when grunt svn-ignore is run
-LoginDialogWrapper.js
-SessionMenu.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
-couch.js
-### end grunt-svn-ignore managed ignores