Replace some legacy routes with redirects

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

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index 88bae59ecb214eda71e96dfcf5e3322a0c416a76..cadb6b628f1b672fa9dd46aaa6a2adf5279ddca1 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -8,9 +8,9 @@
 
   The router is initialized with a set of routes: a mapping of URL path templates
   to route controller objects. Path templates can contain placeholders
 
   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 three methods that are called at defined
+  Route controller objects can define four methods that are called at defined

   times during routing:
 
      * The `load` method is called by the router when a path which matches the
   times during routing:
 
      * The `load` method is called by the router when a path which matches the


@@ -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`:
 
    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.
 
    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
    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) {
    `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);
 
     currentRoute = routes.recognize(currentPath),
     currentHash = location.hash || OSM.formatHash(map);