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

Timestamp:

02/16/12 14:47:39 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Finished page framework. See rft/ui/content.js or test files for details.
• [Client] Allow login by pressing Enter.
• [API] On exception include details in json response.
• [Server Use Exceptions when save() fails, iso return values.

File:

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

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

@@ -1 @@
-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){
+define(['dojo/_base/declare','dojo/_base/connect','dojo/_base/xhr',
+    'dojo/_base/lang','dojo/_base/Deferred','dojo/hash',
+    'dojo/io-query','dijit','rft/util','rft/ui/_Page'],
+    function(declare,connect,xhr,lang,Deferred,hash,uriQuery,dijit,util,_Page){
         return new (function() {
             var self = this;
-            var current = "";
+            var currentHash = "";
+            var currentPage = null;
             
             var HRI = declare(null,{
                 constructor: function() {
-                    this._path = '/';
+                    this._path = this._fixPath('/');
                     this._args = {};
                     if ( arguments.length == 1 ) {
@@ -54 +55 @@
             function _goTo(hri,replace) {
                 var contentPane = dijit.byId('content');
-                var d = new Deferred();
+                var dfd = new Deferred();
                 var newHash = hri.hash();
-                if ( current == newHash ) {
-                    d.resolve();
-                    return d.promise;
+                
+                // if already there, return
+                if ( currentHash === newHash ) {
+                    dfd.resolve();
+                    return dfd.promise;
                 }
-                current = newHash;
+                
+                // check if we can leave current page
+                if ( currentPage ) {
+                    if ( currentPage.onLeave() === false ) {
+                        dfd.reject();
+                        return dfd.promise;
+                    }
+                }
+                
+                // update hash
+                currentHash = newHash;
                 hash(newHash,replace);
+                
+                // load html
+                var pageUrl = 'pages'+hri.path()+'.html';
                 xhr.get({
-                    url: 'pages'+hri.path()+'.html',
+                    url: pageUrl,
                     failOk: true
                 })
+                
+                // initialize page or create error message
                 .then(function(html){
-                    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();
+                    currentPage = new _Page({
+                        templateString: html,
+                        pageQuery: hri.args()
+                    });
+                    contentPane.set('content',currentPage);
+                    dfd.resolve();
                 },function(){
-                    contentPane.set('content',"Page "+hri.path()+" not found.");
-                    d.reject();
+                    currentPage = new _Page({
+                        templateString: "<div>Page "+hri.path()+" not found.</div>"
+                    });
+                    contentPane.set('content',currentPage);
+                    dfd.reject();
                 });
-                return d.promise;
+                return dfd.promise;
             }
 
             self.initial = function(path,args) {
-                if ( current ) {
+                if ( currentHash ) {
                     var dfd = new Deferred();
-                    dfd.resolved();
+                    dfd.resolve();
                     return dfd.promise;
                 }