Log failures to match a route for the initial path

[rails.git] / app / assets / javascripts / router.js

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index 0c855d2d3f95b1f0c6c83aff2faee585cb856a0b..0d57b80d488c3d56e291272b2ba9070ac0bd5508 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -8,7 +8,7 @@
 
   The router is initialized with a set of routes: a mapping of URL path templates
   to route controller objects. Path templates can contain placeholders
-  (`/browse/note/:id`) and optional segments (`/browse/:type/:id(/history)`).
+  (`/note/:id`) and optional segments (`/:type/:id(/history)`).
 
   Route controller objects can define four methods that are called at defined
   times during routing:
@@ -34,7 +34,7 @@
    An instance of OSM.Router is assigned to `OSM.router`. To navigate to a new page
    via pushState (with automatic full-page load fallback), call `OSM.router.route`:
 
-       OSM.router.route('/browse/way/1234');
+       OSM.router.route('/way/1234');
 
    If `route` is passed a path that matches one of the path templates, it performs
    the appropriate actions and returns true. Otherwise it returns false.
@@ -42,7 +42,7 @@
    OSM.Router also handles updating the hash portion of the URL containing transient
    map state such as the position and zoom level. Some route controllers may wish to
    temporarily suppress updating the hash (for example, to omit the hash on pages
-   such as `/browse/way/1234` unless the map is moved). This can be done by calling
+   such as `/way/1234` unless the map is moved). This can be done by calling
    `OSM.router.moveListenerOff` and `OSM.router.moveListenerOn`.
  */
 OSM.Router = function(map, rts) {
@@ -91,7 +91,7 @@ OSM.Router = function(map, rts) {
     }
   };
 
-  var currentPath = window.location.pathname + window.location.search,
+  var currentPath = window.location.pathname.replace(/(.)\/$/, '$1') + window.location.search,
     currentRoute = routes.recognize(currentPath),
     currentHash = location.hash || OSM.formatHash(map);
 
@@ -169,8 +169,12 @@ OSM.Router = function(map, rts) {
   };
 
   router.load = function() {
-    var loadState = currentRoute.run('load', currentPath);
-    router.stateChange(loadState || {});
+    if (currentRoute) {
+      var loadState = currentRoute.run('load', currentPath);
+      router.stateChange(loadState || {});
+    } else {
+      console.log("Unable to match route for: " + currentPath);
+    }
   };
 
   map.on('moveend baselayerchange overlaylayerchange', router.updateHash);