Changeset 492 for Dev/trunk/src/client/qed-client/ui

Timestamp:

03/09/14 14:23:42 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Enable/disable buttons on content change.
• One place to do date formatting, because it was going wrong again.
• Serialize questions in survey properly.
• _ComplexValueMixin consumes submit events, but does trigger outer forms if present.
• Trigger dialog show/hide for login only after previous effect is finished.
• Check that documents are actually valid, not just that validator returned a result.
• Validate email and timestamp formats.
• Prepared for live runs.

Location:

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

Files:

• LoginDialogWrapper.coffee (modified) (3 diffs)
• templates/LoginDialogWrapper.html (modified) (1 diff)

Dev/trunk/src/client/qed-client/ui/LoginDialogWrapper.coffee

@@ -9 +9 @@
     "dojo/_base/lang",
     "dojo/on",
+    "dojo/when",
     "dojo/text!./templates/LoginDialogWrapper.html"
 ], (session, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin,
-    registry, declare, event, lang, _on, template) ->
+    registry, declare, event, lang, _on, _when, template) ->
     declare [_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],
         templateString: template
+        _fx: null
         startup: () ->
             if @_started then return
@@ -25 +27 @@
                               value.password
                 .then () =>
-                    @loginDialog.hide()
+                    @_fx = _when(@_fx)
+                    .then () =>
+                        @loginDialog.hide()
                 , () =>
                     alert "Login failed!"
@@ -31 +35 @@
             false
         onUserChange: (user) ->
-            if user
-                @loginDialog.hide()
-            else
-                @loginDialog.show()
+            @_fx = _when(@_fx)
+            .then () =>
+                if user
+                    @loginDialog.hide()
+                else
+                    @loginDialog.show()
             null

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

@@ -25 +25 @@
             <div data-dojo-type="dijit/form/Button"
                  type="submit"
-                 data-dojo-attach-event="onLogin">Login</div>
+                 data-dojo-attach-event="onClick:onLogin">Login</div>
         </form>
     </div>