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

Timestamp:

02/20/12 16:27:19 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• [Client] Moved pages in subtree of rft/, allowing controllers next to them.
• [Client] Created questions page, gives overview and allows adding.
• [Client] Page controllers inherit from _Page, because the previous mechanism w

asn't working.

• [Client] Added new user registration.
• [Server] Changed user passwords to passwordHash/passwordSalt combination.
• [Server] Added simple object marshalling and unmarshalling to preserve types.
• [Server] Added ResearchToolObjectInterface? with static create() method. Implemented for all model classes.

File:

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

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

@@ -92 +92 @@
                         return dfd.promise;
                     }
+                    currentPage = null;
                 }
                 
@@ -99 +100 @@
                 
                 // load html
-                var pageUrl = 'pages'+hri.path()+'.html';
+                var pageUrl = 'rft/pages'+hri.path()+'.html';
                 xhr.get({
                     url: pageUrl,
@@ -107 +108 @@
                 // initialize page or create error message
                 .then(function(html){
-                    currentPage = new _Page({
-                        templateString: html,
-                        pageQuery: hri.args()
-                    });
-                    contentPane.set('content',currentPage);
+                    contentPane.set('content',html);
+                    var rootNode = contentPane.containerNode.firstChild;
+                    currentPage = dijit.byNode(rootNode);
+                    if ( !currentPage ) {
+                        currentPage = new _Page({},rootNode);
+                    }
                     dfd.resolve();
                 },function(){
-                    currentPage = new _Page({
-                        templateString: "<div>Page "+hri.path()+" not found.</div>"
-                    });
-                    contentPane.set('content',currentPage);
+                    contentPane.set('content',"<div>Page "+hri.path()+" not found.</div>");
                     dfd.reject();
                 });