Changeset 420 for Dev/branches/rest-dojo-ui/client/qed/app

Timestamp:

12/16/12 20:07:35 (12 years ago)

Author:

hendrikvanantwerpen

Message:

We can store answers for surveys now!

Introduces SurveyRun?, which can be edited. Workflow not quite clear yet. A
running survey can be accessed to leave a response. When the response
has an ID, it is loaded (used for closed surveys and continuations). A
researcher cannot create responses yet. He should also be able to add
comments to responses (that he creates).

Introduced caching of store requests.

Factored out path matching and formatting.

Put object creation in separate classes, to localize model/storage
dependency. Not consistent at the moment.

Location:

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

Files:

• Notifications.js (modified) (1 diff)
• Path.js (added)
• Router.js (modified) (5 diffs)

Dev/branches/rest-dojo-ui/client/qed/app/Notifications.js

@@ -3 +3 @@
     return declare([Toaster],{
         positionDirection: "br-up",
-        duration: 1000
+        duration: 3000
     });
 });

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

@@ -2 +2 @@
     'dojo/_base/declare',
     'dojo/hash',
-    'dojo/io-query',
     'dojo/topic',
     './Content',
-    './Page'
-],function(declare,hash,ioQuery,topic,Content,Page){
+    './Page',
+    './Path'
+],function(declare,hash,topic,Content,Page,Path){
 
     var Router = declare(null,{
@@ -12 +12 @@
         _routes: null,
         _previousHash: null,
-
-        _paramMatch: /:(\w[\w\d]*)/g,
-        _paramReplace: "([^\\/!]+)",
 
         constructor: function() {
@@ -29 +26 @@
 
             if ( hash() === "" ) {
-                hash("#!/");
+                hash(Path.getDefault());
             }
             this._handlePathChange(hash());
@@ -40 +37 @@
                 console.warn('Registering routes after startup() is called is discouraged.');
             }
+            var callback = this._normalizeCallback(route);
+            if ( callback ) {
+                if ( route.path ) {
+                    route.callback = callback;
+                    route.path = new Path(route.path);
+                    this._routes.push(route);
+                } else {
+                    this._defaultCallback = callback;
+                }
+            } else {
+                console.warn("Route "+(route.path||"default")+" has no action.");
+            }
+        },
+        _normalizeCallback: function(route) {
             var self = this;
-            var callback;
+            var callback = null;
             if ( route.callback ) {
                 callback = function(params){
@@ -55 +66 @@
                 };
             }
-            if ( callback ) {
-                if ( route.path ) {
-                    this._routes.push(this._createRoute(route.path,callback));
-                } else {
-                    this._defaultCallback = callback;
-                }
-            } else {
-                console.warn("Route "+(route.path||"default")+" has no action.");
-            }
-        },
-        _createRoute: function(path,callback) {
-            var match, route = {};
-            route.callback = callback;
-            route.paramNames = [];
-                        while((match = this._paramMatch.exec(path)) !== null){
-                                route.paramNames.push(match[1]);
-                        }
-            path = path.replace(this._paramMatch, this._paramReplace);
-            route.regexp = new RegExp('^!'+path+'(!(.*))?$');
-            return route;
+            return callback;
         },
         _handlePathChange: function(newHash) {
             if ( this._previousHash === newHash ) { return; }
             this._previousHash = newHash;
-
             for (var i = this._routes.length-1; i >= 0; i--) {
-                var result;
                 var route = this._routes[i];
-
-                if ((result = route.regexp.exec(newHash)) !== null) {
-                    var numParams = route.paramNames.length;
-
-                    var params = {};
-                    for (var j = 0; j < numParams; j++) {
-                        params[route.paramNames[j]] = result[j+1];
-                    }
-
-                    if ( result.length > numParams+1 && result[numParams+2] ) {
-                        params.options = ioQuery.queryToObject(result[numParams+2]);
-                    }
-
+                var params = null;
+                if ((params = route.path.match(newHash)) !== null) {
                     try {
                         route.callback(params);
                     } catch(err) {
-                        console.warn("Page change failed.",err);
+                        console.error("Page change failed.",err);
                     }
                     return;
                 }
             }
-
             try {
                 this._defaultCallback();
             } catch(err) {
-                console.warn("Default page failed.",err);
+                console.error("Default page failed.",err);
             }
         },
         go: function(path,args) {
             if ( !this._started ) { return; }
-            var newHash = this._pathToHash(path,args);
+            var newHash = Path.format(path,args);
             this._handlePathChange(newHash);
             hash(newHash);
         },
-        _pathToHash: function(path,args) {
-            var hash = '!'+path;
-            if ( args ) {
-                hash += '!'+ioQuery.objectToQuery(args);
-            }
-            return hash;
-        },
         _defaultCallback: function() {
             Content.set(new Page({
-                templateString: "<div>Requested page not found. Go <a href=\"#!/\">home</a>.</div>"
+                templateString: "<div>Requested page not found. Go <a href=\"#"+Path.getDefault()+"\">home</a>.</div>"
             }));
         }