X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c5be2b6f8498ba4f0df1fc95f307078320e2b5be..2b4f8e92c969a5508b73ae7af45811a118fda6b1:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index f6cb02230..f1644c06f 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -33,17 +33,23 @@
     }
 
     $('#sidebar_content')
-      .empty()
-      .load(path, function(a, b, xhr) {
+      .empty();
+
+    $.ajax({
+      url: path,
+      dataType: "html",
+      complete: function(xhr) {
         clearTimeout(loaderTimeout);
         $('#sidebar_loader').hide();
+        $('#sidebar_content').html(xhr.responseText);
         if (xhr.getResponseHeader('X-Page-Title')) {
           document.title = xhr.getResponseHeader('X-Page-Title');
         }
         if (callback) {
           callback();
         }
-      });
+      }
+    });
   };
 })();
 
@@ -197,6 +203,11 @@ $(document).ready(function () {
       map.invalidateSize({pan: false})
         .panBy([-300, 0], {animate: false});
       OSM.loadSidebarContent(path);
+      page.load();
+    };
+
+    page.load = function() {
+      return map.getState();
     };
 
     page.popstate = function(path) {
@@ -224,9 +235,7 @@ $(document).ready(function () {
     };
 
     page.load = function(path, type, id) {
-      if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
-
-      map.addObject({type: type, id: parseInt(id)}, {zoom: window.location.hash == ""});
+      map.addObject({type: type, id: parseInt(id)});
     };
 
     page.unload = function() {
@@ -252,6 +261,8 @@ $(document).ready(function () {
     "/browse/:type/:id(/history)": OSM.Browse(map)
   });
 
+  OSM.route.load();
+
   $(document).on("click", "a", function(e) {
     if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
     if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();