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

Timestamp:

02/28/12 16:19:52 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[Client] Added surveys list and survey details skeleton pages.
[Client] Changed method of passing parameters to pages. This still feels clumsy, because we're working against Dojo a bit with this.
[Server] Integrated REST resources for collections and objects, since they shared more than they differed.

File:

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

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

@@ -19 +19 @@
  * this e.g. to ask confirmation of changed values are not saved.
  */
-define(['dojo/_base/declare','dojo/_base/connect','dojo/_base/xhr',
-    'dojo/_base/lang','dojo/_base/Deferred','dojo/hash',
+define(['dojo/_base/declare','dojo/_base/connect','dojo/_base/xhr','dojo/_base/json',
+    'dojo/_base/lang','dojo/_base/Deferred','dojo/hash','dojo/dom-attr','dojo/dom-construct',
     'dojo/io-query','dijit','rft/util','rft/ui/_Page'],
-    function(declare,connect,xhr,lang,Deferred,hash,uriQuery,dijit,util,_Page){
+    function(declare,connect,xhr,json,lang,Deferred,hash,attr,domConstruct,uriQuery,dijit,util,_Page){
         return new (function() {
             var self = this;
-            var currentHash = "";
-            var currentPage = null;
-            
+
             var HRI = declare(null,{
                 constructor: function() {
@@ -73 +71 @@
             });
 
+            var currentHri = null;
+            var currentPage = null;
+            
             function _goTo(hri,replace) {
                 var contentPane = dijit.byId('content');
                 var dfd = new Deferred();
-                var newHash = hri.hash();
                 
                 // if already there, return
-                if ( currentHash === newHash ) {
+                if ( currentHri && currentHri.hash() === hri.hash() ) {
                     dfd.resolve();
                     return dfd.promise;
@@ -88 +88 @@
                     if ( currentPage.onLeave() === false ) {
                         // restore hash if changed by hand or back button
-                        hash(currentHash);
+                        hash(currentHri.hash());
                         dfd.reject();
                         return dfd.promise;
@@ -95 +95 @@
                 }
                 
+                function mixinArgs(node) {
+                    var props = {};
+                    if ( attr.has(node,'data-dojo-props') ) {
+                        props = json.fromJson(attr.get(node,'data-dojo-props'));
+                    }
+                    lang.mixin(props,{pageArgs:hri.args()});
+                    var jsonStr = json.toJson(props);
+                    attr.set(node,'data-dojo-props',jsonStr.slice(1,jsonStr.length-1));
+                }
+                
                 // update hash
-                currentHash = newHash;
-                hash(newHash,replace);
+                currentHri = hri;
+                hash(hri.hash(),replace);
                 
                 // load html
@@ -108 +118 @@
                 // initialize page or create error message
                 .then(function(html){
-                    contentPane.set('content',html);
-                    var rootNode = contentPane.containerNode.firstChild;
+                    var rootNode = domConstruct.toDom(html);
+                    mixinArgs(rootNode);
+                    contentPane.set('content',rootNode);
                     currentPage = dijit.byNode(rootNode);
                     if ( !currentPage ) {
@@ -123 +134 @@
 
             self.initial = function(path,args) {
-                if ( currentHash ) {
+                if ( currentHri ) {
                     var dfd = new Deferred();
                     dfd.resolve();
@@ -140 +151 @@
             }
 
+            self.getArgs = function() {
+                if ( currentHri ) {
+                    return currentHri.args();
+                } else {
+                    return {};
+                }
+            }
+
             connect.subscribe('/dojo/hashchange', function(){
                 _goTo(new HRI(hash()));