X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cbea796ef412840af9a3ec2fd26bf08657fc4cd3..6dd451c7ee48663d6b0753bfe8b4da2060c4cf60:/app/assets/javascripts/router.js diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index a2a20b846..c397a44ec 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -47,10 +47,10 @@ move the map without the hash changing. */ OSM.Router = function (map, rts) { - var escapeRegExp = /[-{}[\]+?.,\\^$|#\s]/g; + var escapeRegExp = /[-{}[\]+?.,\\^$|#\s]/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("^" + @@ -96,8 +96,8 @@ OSM.Router = function (map, rts) { }; 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 = {}; @@ -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, - route = routes.recognize(path); + route = routes.recognize(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(/#.*/, ""), - route = routes.recognize(path); + route = routes.recognize(path); if (!route) return false; currentRoute.run("unload", null, route === currentRoute); var state = OSM.parseHash(url);