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

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

Files:

• auth.js (modified) (1 diff)
• content.js (modified) (4 diffs)
• run.js (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/main.js) (1 diff)
• ui/LoginDialog.html (modified) (1 diff)
• ui/LoginDialog.js (modified) (2 diffs)
• ui/Page.js (modified) (1 diff)

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

@@ -1 @@
-define(['dojo/_base/Deferred','./api'],function(Deferred,api){
-    return new (function() {
-        var self = this;
-        var currentUser = null;
+define(['dojo/_base/Deferred','dojo/_base/xhr','dojo/_base/json'],
+    function(Deferred,xhr,json){
+        return new (function() {
+            var self = this;
+            var currentUser = null;
 
-        self.login = function(username,password) {
-            var d = new Deferred();
-            api.post("login",
-            {
-                username:username,
-                password:password
-            })
-            .then(function(data) {
-                currentUser = data;
-                d.resolve(data);
-            },function(){
-                d.reject(); 
-            });
-            return d.promise;
-        };
+            function post(path,args) {
+                return xhr.post({
+                    url: "../server/api.php"+path,
+                    handleAs: "json",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    rawBody: json.toJson(args)
+                });
+            }
+
+            self.login = function(username,password) {
+                var d = new Deferred();
+                post("/login",
+                {
+                    username:username,
+                    password:password
+                })
+                .then(function(data) {
+                    currentUser = data;
+                    d.resolve(data);
+                },function(){
+                    d.reject(); 
+                });
+                return d.promise;
+            };
+
+            self.restore = function() {
+                var d = new Deferred();
+                post("/login",{})
+                .then(function(data) {
+                    currentUser = data;
+                    d.resolve(data);
+                },function(){
+                    d.reject(); 
+                });
+                return d.promise;
             
-        self.register = function(username,password) {
-            var d = new Deferred();
-            api.post("register",
-            {
-                username:username,
-                password:password
-            })
-            .then(function(data) {
-                currentUser = data;
-                d.resolve(data);
-            },function(){
-                d.reject(); 
-            });
-            return d.promise;
-        };
+            };
+
+            self.register = function(username,password) {
+                var d = new Deferred();
+                post("/register",
+                {
+                    username:username,
+                    password:password
+                })
+                .then(function(data) {
+                    currentUser = data;
+                    d.resolve(data);
+                },function(){
+                    d.reject(); 
+                });
+                return d.promise;
+            };
             
-        self.getUser = function(){
-            return currentUser;
-        };
-    })();
-});
+            self.getUser = function(){
+                return currentUser;
+            };
+        })();
+    });

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

@@ -1 @@
-define(['dojo/_base/declare','dojo/_base/connect','dojo/_base/xhr','dojo/_base/lang','dojo/_base/Deferred','dojo/hash','dojo/io-query','dijit/registry','dijit','rft/util','rft/ui/Page'],
-    function(declare,connect,xhr,lang,Deferred,hash,uriQuery,registry,dijit,util,Page){
+define(['dojo/_base/declare','dojo/_base/connect','dojo/_base/xhr','dojo/dom-construct',
+    'dojo/dom-attr','dojo/_base/lang','dojo/_base/Deferred','dojo/hash',
+    'dojo/io-query','dojo/_base/json','dijit','rft/util'],
+    function(declare,connect,xhr,domConstruct,attr,lang,Deferred,hash,uriQuery,json,dijit,util){
         return new (function() {
             var self = this;
@@ -6 +8 @@
             
             var HRI = declare(null,{
-                constructor: function(){
+                constructor: function() {
                     this._path = '/';
                     this._args = {};
@@ -61 +63 @@
                 hash(newHash,replace);
                 xhr.get({
-                    url: 'pages'+hri.path()+'.html'
+                    url: 'pages'+hri.path()+'.html',
+                    failOk: true
                 })
                 .then(function(html){
-                    contentPane.set('content',html);
-                    var widgets = registry.findWidgets(contentPane.containerNode);
-                    for(var i in widgets) {
-                        if ( widgets[i].isInstanceOf(Page) ) {
-                            widgets[i].init(hri.args());
-                            break;
-                        }
-                    }
+                    var root = domConstruct.toDom(html)
+                    var props = json.toJson(hri.args());
+                    props = props.slice(1,props.length-2);
+                    if ( props )
+                        attr.set(root,'data-rft-props',props);
+                    contentPane.set('content',root);
                     d.resolve();
                 },function(){
@@ -82 +83 @@
             self.initial = function(path,args) {
                 if ( current ) {
-                    return;
+                    var dfd = new Deferred();
+                    dfd.resolved();
+                    return dfd.promise;
                 }
                 if ( hash() ) {
                     var hri = new HRI(hash());
-                    _goTo(hri, true);
+                    return _goTo(hri, true);
                 } else {
-                    _goTo(new HRI(path,args));
+                    return _goTo(new HRI(path,args));
                 }
             }
 
             self.goTo = function(path,args) {
-                _goTo(new HRI(path,args));
+                return _goTo(new HRI(path,args));
             }
 

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

@@ -1 @@
-define(['require'], function(require) {
-    return {};
-});
+require(['dojo/_base/window','dojo/parser', 'rft/ui/LoginDialog', 
+    'dojo/dom', 'dojo/_base/connect', 'rft/auth', 'rft/content',
+    'dojo/domReady!', 'dijit/layout/ContentPane', 'dijit/MenuBar',
+    'dijit/MenuBarItem', 'rft/ui/MenuBarLink', 'rft/ui/Page'],
+    function(win,parser,LoginDialog,dom,connect,auth,content) {
+        parser.parse();
+
+        var login = new LoginDialog().placeAt(document.body);
+        login.startup();
+
+        auth.restore()
+        .then(function(user){
+            content.initial();
+        },function(){
+            login.show();
+        });
+
+        connect.connect(dom.byId('userinfo'),'click',function(){
+            login.show();
+        });
+    });

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(){}
+        });
     });
-});