X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1b19974b1209fdab6f35168290251572ca86f142..6ba9f8ba294bb21d53060e92541dc465b9e42c4a:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index e0ca66766..e83b49947 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -14,6 +14,44 @@
 //= require index/new_note
 //= require router
 
+(function() {
+  var loaderTimeout;
+
+  OSM.loadSidebarContent = function(path, callback) {
+    clearTimeout(loaderTimeout);
+
+    loaderTimeout = setTimeout(function() {
+      $('#sidebar_loader').show();
+    }, 200);
+
+    // IE<10 doesn't respect Vary: X-Requested-With header, so
+    // prevent caching the XHR response as a full-page URL.
+    if (path.indexOf('?') >= 0) {
+      path += '&xhr=1'
+    } else {
+      path += '?xhr=1'
+    }
+
+    $('#sidebar_content')
+      .empty();
+
+    $.ajax({
+      url: path,
+      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();
+        }
+      }
+    });
+  };
+})();
+
 $(document).ready(function () {
   var params = OSM.mapParams();
 
@@ -159,25 +197,17 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
-    function loadContent(path) {
-      $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
-        if (xhr.getResponseHeader('X-Page-Title')) {
-          document.title = xhr.getResponseHeader('X-Page-Title');
-        }
-      });
-    }
-
     page.pushstate = function(path) {
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false})
         .panBy([-300, 0], {animate: false});
-      loadContent(path);
+      OSM.loadSidebarContent(path);
     };
 
     page.popstate = function(path) {
       $("#content").addClass("overlay-sidebar");
       map.invalidateSize({pan: false});
-      loadContent(path);
+      OSM.loadSidebarContent(path);
     };
 
     page.unload = function() {
@@ -193,10 +223,7 @@ $(document).ready(function () {
     var page = {};
 
     page.pushstate = page.popstate = function(path, type, id) {
-      $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
-        if (xhr.getResponseHeader('X-Page-Title')) {
-          document.title = xhr.getResponseHeader('X-Page-Title');
-        }
+      OSM.loadSidebarContent(path, function() {
         page.load(path, type, id);
       });
     };
@@ -204,7 +231,17 @@ $(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: true});
+      map.addObject({type: type, id: parseInt(id)},
+        {
+          zoom: window.location.hash == "",
+          style: {
+            color: "#FF6200",
+            weight: 4,
+            opacity: 1,
+            fillOpacity: 0.5
+          }
+        }
+      );
     };
 
     page.unload = function() {
@@ -238,7 +275,12 @@ $(document).ready(function () {
   $(".search_form").on("submit", function(e) {
     e.preventDefault();
     $("header").addClass("closed");
-    OSM.route("/search?query=" + encodeURIComponent($(this).find("input[name=query]").val()) + OSM.formatHash(map));
+    var query = $(this).find("input[name=query]").val();
+    if (query) {
+      OSM.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
+    } else {
+      OSM.route("/" + OSM.formatHash(map));
+    }
   });
 
   $(".describe_location").on("click", function(e) {