Changeset 491 for Dev/trunk/src/client/qed-client/app/Router.js

Timestamp:

03/08/14 23:48:08 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Include _ObjectPage this time.
• Hash replace doesn't reload page.
• Widget in dialog has name to actually give results.

File:

• Dev/trunk/src/client/qed-client/app/Router.js (modified) (3 diffs)

Dev/trunk/src/client/qed-client/app/Router.js

@@ -1 +1 @@
 define([
     "./Content",
-    "./Page",
     "./Path",
     "dojo/_base/declare",
@@ -9 +8 @@
     "dojo/hash",
     "dojo/on",
-    "dojo/topic"
-], function(Content, Page, Path, declare, event, lang, window, hash, on, topic) {
+    "dojo/topic",
+    "require"
+], function(Content, Path, declare, event, lang, window, hash, on, topic, require) {
 
     var Router = declare(null,{
@@ -108 +108 @@
             return true;
         },
-        go: function(path,args) {
+        go: function(path,args,replace) {
             if ( !this._started ) { return; }
             var newHash = Path.format(path,args);
-            hash(newHash);
+            if ( replace === true ) {
+                this._beforePreviousHash = this._previousHash;
+                this._previousHash = newHash;
+            }
+            hash(newHash,replace);
         },
         _defaultCallback: function() {
-            Content.set(new Page({
-                templateString: "<div>Requested page not found. Go <a href=\"#"+Path.getDefault()+"\">home</a>.</div>"
-            }));
+            require("./Page",function(Page){
+                Content.set(new Page({
+                    templateString: "<div>Requested page not found. Go <a href=\"#"+Path.getDefault()+"\">home</a>.</div>"
+                }));
+            });
         }
     });