Changeset 257 for Dev/branches/rest-dojo-ui

Timestamp:

02/13/12 19:18:57 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Changed hashtag to hashbang syntax and allow parameters to be passed to pages.
Added simple session page that dumps retrieved session in page content.

Location:

Dev/branches/rest-dojo-ui

Files:

• client/pages/mainmenu (deleted)
• client/pages/session (deleted)
• client/pages/session.html (added)
• client/pages/sessions (deleted)
• client/pages/sessions.html (copied) (copied from Dev/branches/rest-dojo-ui/client/pages/sessions/sessions.html) (1 diff)
• client/rft/content.js (modified) (1 diff)
• client/rft/ui/Page.js (modified) (1 diff)
• client/rft/util.js (added)
• log.txt (added)

Dev/branches/rest-dojo-ui/client/pages/sessions.html

@@ -1 +1 @@
 <div data-dojo-type="rft.ui.Page">
-    <script type="dojo/method" data-dojo-event="startup">
+    <script type="dojo/method" data-dojo-event="init" data-dojo-args="args">
         require(['dojo/store/JsonRest','dojox/grid/DataGrid',
             Â Â Â Â 'dojo/data/ObjectStore','dojo/domReady!'],

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

@@ -1 @@
-define(['dojo/_base/connect','dojo/_base/xhr','dojo/_base/Deferred','dojo/hash'],function(connect,xhr,Deferred,hash){
-    return new (function() {
-        var self = this;
-        var current = "";
+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){
+        return new (function() {
+            var self = this;
+            var current = "";
             
-        function init() {
-            connect.subscribe('/dojo/hashchange', function(){
-                var url = hash();
-                self.goTo(url);
+            var HRI = declare(null,{
+                constructor: function(){
+                    this._path = '/';
+                    this._args = {};
+                    if ( arguments.length == 1 ) {
+                        this.hash(arguments[0]);
+                    } else if ( arguments.length == 2 ) {
+                        this.path(arguments[0]);
+                        this.args(arguments[1]);
+                    }
+                },
+                path: function(path) {
+                    if ( path )
+                        this._path = this._fixPath(path);
+                    return this._path;
+                },
+                args: function(args) {
+                    if ( args && lang.isObject(args) )
+                        this._args = args;
+                    return this._args;
+                },
+                hash: function(hash) {
+                    if ( hash && lang.isString(hash) ) {
+                        var parts = hash.split('!');
+                        if ( parts[1] )
+                            this._path = this._fixPath(parts[1]);
+                        if ( parts[2] )
+                            this._args = uriQuery.queryToObject(parts[2]);
+                    }
+                    return '!'+this._path+'!'+uriQuery.objectToQuery(this._args);
+                },
+                _fixPath: function(path) {
+                    if ( !lang.isString(path) || util.isEmptyString(path) ) {
+                        path = "/";
+                    }
+                    if ( path[0] != '/' ) {
+                        path = '/'+path;
+                    }
+                    if ( path[path.length-1] == '/' ) {
+                        path = path + "index";
+                    }
+                    return path;
+                }
             });
-        }
 
-        self.initial = function(location) {
-            if ( current ) {
-                self.goTo(location);
-            }
-            var url = hash();
-            self.goTo(url || location);
-        }
-            
-        self.goTo = function(location) {
-            var contentPane = dijit.byId('content');
-            var d = new Deferred();
-            if ( current == location ) {
-                d.resolve();
+            function _goTo(hri,replace) {
+                var contentPane = dijit.byId('content');
+                var d = new Deferred();
+                var newHash = hri.hash();
+                if ( current == newHash ) {
+                    d.resolve();
+                    return d.promise;
+                }
+                current = newHash;
+                hash(newHash,replace);
+                xhr.get({
+                    url: 'pages'+hri.path()+'.html'
+                })
+                .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;
+                        }
+                    }
+                    d.resolve();
+                },function(){
+                    contentPane.set('content',"Page "+hri.path()+" not found.");
+                    d.reject();
+                });
                 return d.promise;
             }
 
-            current = location;
-            hash(location);
-            xhr.get({
-                url: 'pages/'+location+'/'+location+'.html'
-            })
-            .then(function(content){
-                contentPane.set('content',content);
-                d.resolve();
-            },function(){
-                contentPane.set('content',"Page "+location+" not found.");
-                d.reject();
+            self.initial = function(path,args) {
+                if ( current ) {
+                    return;
+                }
+                if ( hash() ) {
+                    var hri = new HRI(hash());
+                    _goTo(hri, true);
+                } else {
+                    _goTo(new HRI(path,args));
+                }
+            }
+
+            self.goTo = function(path,args) {
+                _goTo(new HRI(path,args));
+            }
+
+            connect.subscribe('/dojo/hashchange', function(){
+                _goTo(new HRI(hash()));
             });
-            return d.promise;
-        }
-            
-        init();
-    })();
-});
+
+        })();
+    });

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

@@ -2 +2 @@
 function(declare,_WidgetBase,_Container){
     return declare('rft.ui.Page',[_WidgetBase,_Container],{
+        init: function(args){
+        }
     });
 });