Merge pull request #3686 from AntonKhorev/embed-https

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

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index 08a6c7268579f65ca341de933c02ca66c2336964..c397a44ec4de3eeeb0e338aceaeca557f3a6865c 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -47,17 +47,17 @@
    move the map without the hash changing.
  */
 OSM.Router = function (map, rts) {
    move the map without the hash changing.
  */
 OSM.Router = function (map, rts) {

-  var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
+  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)?")
         .replace(namedParam, function (match, optional) {
 
   function Route(path, controller) {
     var regexp = new RegExp("^" +
       path.replace(escapeRegExp, "\\$&")
         .replace(optionalParam, "(?:$1)?")
         .replace(namedParam, function (match, optional) {

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

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


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

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


@@ -105,7 +105,7 @@ OSM.Router = function (map, rts) {
     $(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,
     $(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 (path === currentPath) return;
       currentRoute.run("unload", null, route === currentRoute);
       currentPath = path;
       if (path === currentPath) return;
       currentRoute.run("unload", null, route === currentRoute);
       currentPath = path;


@@ -116,7 +116,7 @@ OSM.Router = function (map, rts) {
 
     router.route = function (url) {
       var path = url.replace(/#.*/, ""),
 
     router.route = function (url) {
       var path = url.replace(/#.*/, ""),

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

       if (!route) return false;
       currentRoute.run("unload", null, route === currentRoute);
       var state = OSM.parseHash(url);
       if (!route) return false;
       currentRoute.run("unload", null, route === currentRoute);
       var state = OSM.parseHash(url);