Changeset 410 for Dev/branches/rest-dojo-ui/client/rft/app

Timestamp:

09/07/12 16:59:14 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Next steps to actually make taking surveys possible.

Split Controller in Router and Content. Updated the view.html to work
with the new app/Content mechanism. Include view page in build profile.

Rearranged Couch design documents per type. Changed config tool so the
docs.js can be more readable, functions don't have to be on one line
anymore but are serialized later. Because the .htaccess proxy is limited
to the rft database for security reasons, the config tool has to be run
on Node.js, to be able to access the Couch port (which is limited by
cross domain security in the browser).

Added elastic search to .htaccess proxy as well. Seperated CouchStore?
from rft/store, which contains application specific data.

Removed some old API files that were hanging around still.

Introduced preview mode for viewSurvey page. Changed survey page to
only show published questions to be included. The surveys page has
three categories: drafts, published and runs. Creating survey runs is
not yet implemented.

Location:

Dev/branches/rest-dojo-ui/client/rft/app

Files:

• Content.js (added)
• Router.js (moved) (moved from Dev/branches/rest-dojo-ui/client/rft/app/Controller.js) (8 diffs)

Dev/branches/rest-dojo-ui/client/rft/app/Router.js

@@ -4 +4 @@
     'dojo/io-query',
     'dojo/topic',
-    './Page',
-    'dijit/registry'
-],function(declare,hash,ioQuery,topic,Page,registry){
+    './Content',
+    './Page'
+],function(declare,hash,ioQuery,topic,Content,Page){
 
-
-    var Controller = declare(null,{
+    var Router = declare(null,{
         _started: false,
         _routes: null,
-        _container: null,
         _previousHash: null,
-        _previousContent: null,
 
         _paramMatch: /:(\w[\w\d]*)/g,
-        _paramReplace: "([^\\/]+)",
+        _paramReplace: "([^\\/!]+)",
 
         constructor: function() {
@@ -24 +21 @@
         startup: function() {
             if ( this._started ) { return; }
+            if ( !Content._started ) {
+                Content.startup();
+            }
+            this._started = true;
 
             var self = this;
-
-            this._container = registry.byId('content');
-            if ( !this._container || !this._container.addChild ) {
-                throw new Error("Cannot find container widget with id 'content'.");
-            }
-            this._started = true;
 
             if ( hash() === "" ) {
@@ -42 +37 @@
         },
         register: function(route) {
+            if ( this._started ) {
+                console.warn('Registering routes after startup() is called is discouraged.');
+            }
             var self = this;
             var callback;
             if ( route.callback ) {
                 callback = function(params){
-                    self._setContent(route.callback(params));
+                    Content.set(route.callback(params));
                 };
             } else if ( route.redirect ) {
@@ -54 +52 @@
             } else if ( route.constructor ) {
                 callback = function(params){
-                    self._setContent( new route.constructor(params) );
+                    Content.set( new route.constructor(params) );
                 };
             }
@@ -75 +73 @@
                         }
             path = path.replace(this._paramMatch, this._paramReplace);
-            route.regexp = new RegExp('^!'+path+'(!.*)?$');
+            route.regexp = new RegExp('^!'+path+'(!(.*))?$');
             return route;
         },
@@ -94 +92 @@
                     }
 
-                    if ( result.length > numParams+1 ) {
-                        params.options = ioQuery.queryToObject(result[numParams]);
+                    if ( result.length > numParams+1 && result[numParams+2] ) {
+                        params.options = ioQuery.queryToObject(result[numParams+2]);
                     }
 
@@ -126 +124 @@
             return hash;
         },
-        _setContent: function(widget) {
-            if ( this._previousContent ) {
-                this._previousContent.destroyRecursive();
-                this._previousContent = null;
-            }
-            widget.region = 'center';
-            this._container.addChild(widget);
-            this._previousContent = widget;
-        },
         _defaultCallback: function() {
-            this._setContent(new Page({
+            Content.set(new Page({
                 templateString: "<div>Requested page not found. Go <a href=\"#!/\">home</a>.</div>"
             }));
@@ -142 +131 @@
     });
 
-    return new Controller();
+    return new Router();
 });