Merge remote-tracking branch 'upstream/pull/4179'

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

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index c42e703c58aa036cfdf2c8e824a3385e460311cb..d890f38a480a384d6edd5570e384f71916cc30bc 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -46,32 +46,32 @@
    `OSM.router.withoutMoveListener` to run a block of code that may update
    move the map without the hash changing.
  */
    `OSM.router.withoutMoveListener` to run a block of code that may update
    move the map without the hash changing.
  */

-OSM.Router = function(map, rts) {
-  var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
+OSM.Router = function (map, rts) {
+  var escapeRegExp = /[-{}[\]+?.,\\^$|#\s]/g;

   var optionalParam = /\((.*?)\)/g;
   var optionalParam = /\((.*?)\)/g;

-  var namedParam    = /(\(\?)?:\w+/g;
-  var splatParam    = /\*\w+/g;
+  var namedParam = /(\(\?)?:\w+/g;
+  var splatParam = /\*\w+/g;

 
   function Route(path, controller) {
     var regexp = new RegExp("^" +
       path.replace(escapeRegExp, "\\$&")
         .replace(optionalParam, "(?:$1)?")
 
   function Route(path, controller) {
     var regexp = new RegExp("^" +
       path.replace(escapeRegExp, "\\$&")
         .replace(optionalParam, "(?:$1)?")

-        .replace(namedParam, function(match, optional){
-          return optional ? match : "([^\/]+)";
+        .replace(namedParam, function (match, optional) {
+          return optional ? match : "([^/]+)";

         })
         .replace(splatParam, "(.*?)") + "(?:\\?.*)?$");
 
     var route = {};
 
         })
         .replace(splatParam, "(.*?)") + "(?:\\?.*)?$");
 
     var route = {};
 

-    route.match = function(path) {
+    route.match = function (path) {

       return regexp.test(path);
     };
 
       return regexp.test(path);
     };
 

-    route.run = function(action, path) {
+    route.run = function (action, path) {

       var params = [];
 
       if (path) {
       var params = [];
 
       if (path) {

-        params = regexp.exec(path).map(function(param, i) {
+        params = regexp.exec(path).map(function (param, i) {

           return (i > 0 && param) ? decodeURIComponent(param) : param;
         });
       }
           return (i > 0 && param) ? decodeURIComponent(param) : param;
         });
       }


@@ -85,77 +85,68 @@ OSM.Router = function(map, rts) {
   }
 
   var routes = [];
   }
 
   var routes = [];

-  for (var r in rts)
+  for (var r in rts) {

     routes.push(new Route(r, rts[r]));
     routes.push(new Route(r, rts[r]));

+  }

 
 

-  routes.recognize = function(path) {
+  routes.recognize = function (path) {

     for (var i = 0; i < this.length; i++) {
       if (this[i].match(path)) return this[i];
     }
   };
 
   var currentPath = window.location.pathname.replace(/(.)\/$/, "$1") + window.location.search,
     for (var i = 0; i < this.length; i++) {
       if (this[i].match(path)) return this[i];
     }
   };
 
   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);

 
   var router = {};
 
 
   var router = {};
 

-  if (window.history && window.history.pushState) {
-    $(window).on("popstate", function(e) {
-      if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?
-      var path = window.location.pathname + window.location.search,
-        route = routes.recognize(path);
-      if (path === currentPath) return;
-      currentRoute.run("unload", null, route === currentRoute);
-      currentPath = path;
-      currentRoute = route;
-      currentRoute.run("popstate", currentPath);
-      map.setState(e.originalEvent.state, {animate: false});
-    });
-
-    router.route = function (url) {
-      var path = url.replace(/#.*/, ""),
+  $(window).on("popstate", function (e) {
+    if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?
+    var path = window.location.pathname + window.location.search,

         route = routes.recognize(path);
         route = routes.recognize(path);

-      if (!route) return false;
-      currentRoute.run("unload", null, route === currentRoute);
-      var state = OSM.parseHash(url);
-      map.setState(state);
-      window.history.pushState(state, document.title, url);
-      currentPath = path;
-      currentRoute = route;
-      currentRoute.run("pushstate", currentPath);
-      return true;
-    };
+    if (path === currentPath) return;
+    currentRoute.run("unload", null, route === currentRoute);
+    currentPath = path;
+    currentRoute = route;
+    currentRoute.run("popstate", currentPath);
+    map.setState(e.originalEvent.state, { animate: false });
+  });

 
 

-    router.replace = function (url) {
-      window.history.replaceState(OSM.parseHash(url), document.title, url);
-    };
+  router.route = function (url) {
+    var path = url.replace(/#.*/, ""),
+        route = routes.recognize(path);
+    if (!route) return false;
+    currentRoute.run("unload", null, route === currentRoute);
+    var state = OSM.parseHash(url);
+    map.setState(state);
+    window.history.pushState(state, document.title, url);
+    currentPath = path;
+    currentRoute = route;
+    currentRoute.run("pushstate", currentPath);
+    return true;
+  };

 
 

-    router.stateChange = function(state) {
-      if (state.center) {
-        window.history.replaceState(state, document.title, OSM.formatHash(state));
-      } else {
-        window.history.replaceState(state, document.title, window.location);
-      }
-    };
-  } else {
-    router.route = router.replace = function (url) {
-      window.location.assign(url);
-    };
+  router.replace = function (url) {
+    window.history.replaceState(OSM.parseHash(url), document.title, url);
+  };

 
 

-    router.stateChange = function(state) {
-      if (state.center) window.location.replace(OSM.formatHash(state));
-    };
-  }
+  router.stateChange = function (state) {
+    if (state.center) {
+      window.history.replaceState(state, document.title, OSM.formatHash(state));
+    } else {
+      window.history.replaceState(state, document.title, window.location);
+    }
+  };

 
 

-  router.updateHash = function() {
+  router.updateHash = function () {

     var hash = OSM.formatHash(map);
     if (hash === currentHash) return;
     currentHash = hash;
     router.stateChange(OSM.parseHash(hash));
   };
 
     var hash = OSM.formatHash(map);
     if (hash === currentHash) return;
     currentHash = hash;
     router.stateChange(OSM.parseHash(hash));
   };
 

-  router.hashUpdated = function() {
+  router.hashUpdated = function () {

     var hash = location.hash;
     if (hash === currentHash) return;
     currentHash = hash;
     var hash = location.hash;
     if (hash === currentHash) return;
     currentHash = hash;


@@ -177,7 +168,7 @@ OSM.Router = function(map, rts) {
     map.off("movestart", disableMoveListener);
   };
 
     map.off("movestart", disableMoveListener);
   };
 

-  router.load = function() {
+  router.load = function () {

     var loadState = currentRoute.run("load", currentPath);
     router.stateChange(loadState || {});
   };
     var loadState = currentRoute.run("load", currentPath);
     router.stateChange(loadState || {});
   };