Changeset 260 for Dev/branches/rest-dojo-ui/client/rft/ui

Timestamp:

02/14/12 18:22:25 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Clear LoginDialog? on show (in case of re-show).
• Allow to link nodes/widgets to rft.ui.Page members with data-rft-attach-point attribute.
• Allow arguments to a page to be passed with data-rft-props argument. Content loader rft.content sets this argument on the top node of a loaded page.
• Have longer cookie-lifetime and update cookie when session is restored. Allow session restore in API and client code.
• Moved startup Javascript to rft/run.js.

Location:

Dev/branches/rest-dojo-ui/client/rft/ui

Files:

• LoginDialog.html (modified) (1 diff)
• LoginDialog.js (modified) (2 diffs)
• Page.js (modified) (1 diff)

Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.html

@@ -6 +6 @@
         </span>
     </div>
-    <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="loginForm">
-        <fieldset>
-            <label for="username" class="loginLabel">Email</label>
-            <input data-dojo-type="dijit.form.TextBox" name="username" type="text" class="loginInput" />
-            <label for="password" class="loginLabel">Password</label>
-            <input data-dojo-type="dijit.form.TextBox" name="password" type="password" class="loginInput" />
-        </fieldset>
-    </form>
-    <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onLogin">Login</button>
-    <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCancel">Cancel</button>
-    <div data-dojo-attach-point="loginErrors"></div>
-    <div data-dojo-attach-point="containerNode"></div>
+    <div data-dojo-attach-point="containerNode">
+        <form data-dojo-type="dijit.form.Form" data-dojo-attach-point="loginForm">
+            <fieldset>
+                <label for="username" class="loginLabel">Email</label>
+                <input data-dojo-type="dijit.form.TextBox" name="username" type="text" class="loginInput" />
+                <label for="password" class="loginLabel">Password</label>
+                <input data-dojo-type="dijit.form.TextBox" name="password" type="password" class="loginInput" />
+            </fieldset>
+        </form>
+        <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onLogin">Login</button>
+        <button type="button" data-dojo-type="dijit.form.Button" data-dojo-attach-event="onClick:onCancel">Cancel</button>
+        <div data-dojo-attach-point="loginErrors"></div>
+    </div>
 </div>

Dev/branches/rest-dojo-ui/client/rft/ui/LoginDialog.js

@@ -8 +8 @@
             title: "Login",
             baseClass: "rftLoginDialog",
+            show: function() {
+                this.loginErrors.innerHTML = '';
+                this.loginForm.reset();
+                this.inherited(arguments);
+            },
             onLogin: function() {
                 this.loginErrors.innerHTML = '';
@@ -15 +20 @@
                 .then(function() {
                     hide();
-                    content.initial("sessions");
+                    content.initial();
                 },function() {
                     this.loginErrors.innerHTML = 'Login failed.';

Dev/branches/rest-dojo-ui/client/rft/ui/Page.js

@@ -1 @@
-define(['dojo/_base/declare','dijit/_WidgetBase','dijit/_Container'],
-function(declare,_WidgetBase,_Container){
-    return declare('rft.ui.Page',[_WidgetBase,_Container],{
-        init: function(args){
-        }
+define(['dojo/_base/declare','dojo/query','dojo/_base/json','dojo/dom-attr','dojo/_base/lang','dijit/registry','dijit/_WidgetBase','dijit/_Container'],
+    function(declare,query,json,attr,lang,registry,_WidgetBase,_Container){
+        return declare('rft.ui.Page',[_WidgetBase,_Container],{
+            postCreate: function() {
+                this.inherited(arguments);
+                this.args = {};
+                var props = attr.get(this.domNode,'data-rft-props');
+                if ( props ) {
+                    props = json.fromJson.call(this,'{'+props+'}');
+                    lang.mixin(this.args,props);
+                }
+            },
+            startup: function() {
+                this.inherited(arguments);
+                query('[data-rft-attach-point]').forEach(lang.hitch(this,function(node){
+                    var name = attr.get(node,'data-rft-attach-point');
+                    this[name] = registry.byNode(node) || node;
+                }));
+                this.init();
+            },
+            init: function(){}
+        });
     });
-});