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

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.

File:

• Dev/branches/rest-dojo-ui/client/rft/content.js (modified) (4 diffs)

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