Use double quotes consistently in javascript code

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

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index ab206410703e81a4db32cecf914551d539b9e535..c42e703c58aa036cfdf2c8e824a3385e460311cb 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -42,8 +42,9 @@
    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 `/way/1234` unless the map is moved). This can be done by calling
-   `OSM.router.moveListenerOff` and `OSM.router.moveListenerOn`.
+   such as `/way/1234` unless the map is moved). This can be done by using
+   `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;


@@ -52,13 +53,13 @@ OSM.Router = function(map, rts) {
   var splatParam    = /\*\w+/g;
 
   function Route(path, controller) {
   var splatParam    = /\*\w+/g;
 
   function Route(path, controller) {

-    var regexp = new RegExp('^' +
-      path.replace(escapeRegExp, '\\$&')
-        .replace(optionalParam, '(?:$1)?')
+    var regexp = new RegExp("^" +
+      path.replace(escapeRegExp, "\\$&")
+        .replace(optionalParam, "(?:$1)?")

         .replace(namedParam, function(match, optional){
         .replace(namedParam, function(match, optional){

-          return optional ? match : '([^\/]+)';
+          return optional ? match : "([^\/]+)";

         })
         })

-        .replace(splatParam, '(.*?)') + '(?:\\?.*)?$');
+        .replace(splatParam, "(.*?)") + "(?:\\?.*)?$");

 
     var route = {};
 
 
     var route = {};
 


@@ -75,6 +76,8 @@ OSM.Router = function(map, rts) {
         });
       }
 
         });
       }
 

+      params = params.concat(Array.prototype.slice.call(arguments, 2));
+

       return (controller[action] || $.noop).apply(controller, params);
     };
 
       return (controller[action] || $.noop).apply(controller, params);
     };
 


@@ -83,7 +86,7 @@ OSM.Router = function(map, rts) {
 
   var routes = [];
   for (var r in rts)
 
   var routes = [];
   for (var r in rts)

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

 
   routes.recognize = function(path) {
     for (var i = 0; i < this.length; i++) {
 
   routes.recognize = function(path) {
     for (var i = 0; i < this.length; i++) {


@@ -91,38 +94,43 @@ OSM.Router = function(map, rts) {
     }
   };
 
     }
   };
 

-  var currentPath = window.location.pathname.replace(/(.)\/$/, '$1') + window.location.search,
+  var currentPath = window.location.pathname.replace(/(.)\/$/, "$1") + window.location.search,

     currentRoute = routes.recognize(currentPath),
     currentHash = location.hash || OSM.formatHash(map);
 
   var router = {};
 
   if (window.history && window.history.pushState) {
     currentRoute = routes.recognize(currentPath),
     currentHash = location.hash || OSM.formatHash(map);
 
   var router = {};
 
   if (window.history && window.history.pushState) {

-    $(window).on('popstate', function(e) {
+    $(window).on("popstate", function(e) {

       if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?
       if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?

-      var path = window.location.pathname + window.location.search;
+      var path = window.location.pathname + window.location.search,
+        route = routes.recognize(path);

       if (path === currentPath) return;
       if (path === currentPath) return;

-      currentRoute.run('unload');
+      currentRoute.run("unload", null, route === currentRoute);

       currentPath = path;
       currentPath = path;

-      currentRoute = routes.recognize(currentPath);
-      currentRoute.run('popstate', currentPath);
+      currentRoute = route;
+      currentRoute.run("popstate", currentPath);

       map.setState(e.originalEvent.state, {animate: false});
     });
 
     router.route = function (url) {
       map.setState(e.originalEvent.state, {animate: false});
     });
 
     router.route = function (url) {

-      var path = url.replace(/#.*/, ''),
+      var path = url.replace(/#.*/, ""),

         route = routes.recognize(path);
       if (!route) return false;
         route = routes.recognize(path);
       if (!route) return false;

-      currentRoute.run('unload');
+      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;
       var state = OSM.parseHash(url);
       map.setState(state);
       window.history.pushState(state, document.title, url);
       currentPath = path;
       currentRoute = route;

-      currentRoute.run('pushstate', currentPath);
+      currentRoute.run("pushstate", currentPath);

       return true;
     };
 
       return true;
     };
 

+    router.replace = function (url) {
+      window.history.replaceState(OSM.parseHash(url), document.title, url);
+    };
+

     router.stateChange = function(state) {
       if (state.center) {
         window.history.replaceState(state, document.title, OSM.formatHash(state));
     router.stateChange = function(state) {
       if (state.center) {
         window.history.replaceState(state, document.title, OSM.formatHash(state));


@@ -131,7 +139,7 @@ OSM.Router = function(map, rts) {
       }
     };
   } else {
       }
     };
   } else {

-    router.route = function (url) {
+    router.route = router.replace = function (url) {

       window.location.assign(url);
     };
 
       window.location.assign(url);
     };
 


@@ -156,16 +164,21 @@ OSM.Router = function(map, rts) {
     router.stateChange(state, hash);
   };
 
     router.stateChange(state, hash);
   };
 

-  router.moveListenerOn = function() {
-    map.on('moveend', router.updateHash);
-  };
+  router.withoutMoveListener = function (callback) {
+    function disableMoveListener() {
+      map.off("moveend", router.updateHash);
+      map.once("moveend", function () {
+        map.on("moveend", router.updateHash);
+      });
+    }

 
 

-  router.moveListenerOff = function() {
-    map.off('moveend', router.updateHash);
+    map.once("movestart", disableMoveListener);
+    callback();
+    map.off("movestart", disableMoveListener);

   };
 
   router.load = function() {
   };
 
   router.load = function() {

-    var loadState = currentRoute.run('load', currentPath);
+    var loadState = currentRoute.run("load", currentPath);

     router.stateChange(loadState || {});
   };
 
     router.stateChange(loadState || {});
   };
 


@@ -174,8 +187,8 @@ OSM.Router = function(map, rts) {
     currentRoute = routes.recognize(currentPath);
   };
 
     currentRoute = routes.recognize(currentPath);
   };
 

-  map.on('moveend baselayerchange overlaylayerchange', router.updateHash);
-  $(window).on('hashchange', router.hashUpdated);
+  map.on("moveend baselayerchange overlaylayerchange", router.updateHash);
+  $(window).on("hashchange", router.hashUpdated);

 
   return router;
 };
 
   return router;
 };