Prevent empty search

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

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index 7b2e9954622d40255298a839c177354ea1fb2578..fbad1e28c1695f90d37b5a40bef573f491e1afd1 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -1,4 +1,4 @@
-OSM.Router = function(rts) {
+OSM.Router = function(map, rts) {

   var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
   var optionalParam = /\((.*?)\)/g;
   var namedParam    = /(\(\?)?:\w+/g;
   var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
   var optionalParam = /\((.*?)\)/g;
   var namedParam    = /(\(\?)?:\w+/g;


@@ -11,7 +11,7 @@ OSM.Router = function(rts) {
         .replace(namedParam, function(match, optional){
           return optional ? match : '([^\/]+)';
         })
         .replace(namedParam, function(match, optional){
           return optional ? match : '([^\/]+)';
         })

-        .replace(splatParam, '(.*?)') + '(?:$|[?#])');
+        .replace(splatParam, '(.*?)') + '(?:\\?.*)?$');

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


@@ -44,26 +44,59 @@ OSM.Router = function(rts) {
     }
   };
 
     }
   };
 

-  var currentPath = window.location.pathname,
-    currentRoute = routes.recognize(currentPath);
+  var currentPath = window.location.pathname + window.location.search,
+    currentRoute = routes.recognize(currentPath),
+    currentHash = location.hash || OSM.formatHash(map);

 
   currentRoute.run('load', currentPath);
 
 
   currentRoute.run('load', currentPath);
 

+  var stateChange;
+
+  map.on('moveend baselayerchange overlaylayerchange', function() {
+    var hash = OSM.formatHash(map);
+    if (hash === currentHash) return;
+    currentHash = hash;
+    stateChange(OSM.parseHash(hash), hash);
+  });
+
+  $(window).on('hashchange', function() {
+    var hash = location.hash;
+    if (hash === currentHash) return;
+    currentHash = hash;
+    var state = OSM.parseHash(hash);
+    if (!state) return;
+    map.setView(state.center, state.zoom);
+    map.updateLayers(state.layers);
+    stateChange(state, hash);
+  });
+

   if (window.history && window.history.pushState) {
   if (window.history && window.history.pushState) {

-    $(window).on('popstate', function() {
-      var path = window.location.pathname;
+    stateChange = function(state, hash) {
+      window.history.replaceState(state, document.title, hash);
+    };
+
+    // Set a non-null initial state, so that the e.originalEvent.state
+    // check below works correctly when going back to the initial page.
+    stateChange(OSM.parseHash(currentHash), currentPath + currentHash);
+
+    $(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;

       if (path === currentPath) return;
       currentRoute.run('unload');
       currentPath = path;
       currentRoute = routes.recognize(currentPath);
       currentRoute.run('popstate', currentPath);
       if (path === currentPath) return;
       currentRoute.run('unload');
       currentPath = path;
       currentRoute = routes.recognize(currentPath);
       currentRoute.run('popstate', currentPath);

+      var state = e.originalEvent.state;
+      map.setView(state.center, state.zoom, {animate: false});
+      map.updateLayers(state.layers);

     });
 
     return function (url) {
       var path = url.replace(/#.*/, ''),
         route = routes.recognize(path);
       if (!route) return false;
     });
 
     return function (url) {
       var path = url.replace(/#.*/, ''),
         route = routes.recognize(path);
       if (!route) return false;

-      window.history.pushState({}, document.title, url);
+      window.history.pushState(OSM.parseHash(url) || {}, document.title, url);

       currentRoute.run('unload');
       currentPath = path;
       currentRoute = route;
       currentRoute.run('unload');
       currentPath = path;
       currentRoute = route;


@@ -71,6 +104,10 @@ OSM.Router = function(rts) {
       return true;
     }
   } else {
       return true;
     }
   } else {

+    stateChange = function(state, hash) {
+      window.location.replace(hash);
+    };
+

     return function (url) {
       window.location.assign(url);
     }
     return function (url) {
       window.location.assign(url);
     }