Item13069: make sure the url is well-formed

foswiki · Nov 18, 2014 · f330969 · f330969
1 parent 72fbb53
commit f330969
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/pub/System/AngularSkin/controller.uncompressed.js b/pub/System/AngularSkin/controller.uncompressed.js
@@ -35,8 +35,8 @@ app.controller("ViewCtrl", [
 
       var match,
           path = $location.path(),
-          url = $location.absUrl().replace(/#.*/, ""),
-          search = $location.search(),
+          url = ($location.absUrl()||'').replace(/#.*/, ""),
+          search = $location.search()||{},
           angularMode = search.angular,
           web, topic;
 
@@ -55,12 +55,19 @@ app.controller("ViewCtrl", [
       web = web.replace(/^\/|\/$/g, "");
       topic = topic.replace(/^\/|\/$/g, "");
 
+
       // notify foswiki
       foswiki.preferences.WEB = web;
       foswiki.preferences.TOPIC = topic;
 
       //$log.debug("parse path=",path,"script=",$scope.script,"web=",web,"topic=",topic);
 
+      // make sure the url is well-formed by redirecting to the current location
+      // this could be the case using short urls and/or on the root location displaying the frontpage without a foswiki url prefix
+      if (!url) {
+        $location.url("/"+web+"/"+topic);
+      }
+
       if (typeof(angularMode) !== 'undefined' && angularMode === "0") {
         // reload page 
         url = foswiki.getScriptUrl("view", web, topic, { angular: 0});

diff --git a/pub/System/AngularSkin/pkg.uncompressed.js b/pub/System/AngularSkin/pkg.uncompressed.js
@@ -236,8 +236,8 @@ app.controller("ViewCtrl", [
 
       var match,
           path = $location.path(),
-          url = $location.absUrl().replace(/#.*/, ""),
-          search = $location.search(),
+          url = ($location.absUrl()||'').replace(/#.*/, ""),
+          search = $location.search()||{},
           angularMode = search.angular,
           web, topic;
 
@@ -256,12 +256,19 @@ app.controller("ViewCtrl", [
       web = web.replace(/^\/|\/$/g, "");
       topic = topic.replace(/^\/|\/$/g, "");
 
+
       // notify foswiki
       foswiki.preferences.WEB = web;
       foswiki.preferences.TOPIC = topic;
 
       //$log.debug("parse path=",path,"script=",$scope.script,"web=",web,"topic=",topic);
 
+      // make sure the url is well-formed by redirecting to the current location
+      // this could be the case using short urls and/or on the root location displaying the frontpage without a foswiki url prefix
+      if (!url) {
+        $location.url("/"+web+"/"+topic);
+      }
+
       if (typeof(angularMode) !== 'undefined' && angularMode === "0") {
         // reload page 
         url = foswiki.getScriptUrl("view", web, topic, { angular: 0});