Eliminate HTML5 elements

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2d397b812840467e33994a05b2f816d7ada678dd..9514fd5f026e4ffda57e5e0e1e46da41cb428b57 100644 (file)
--- 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();
         }
-      });
+      }
+    });
   };
 })();
 
@@ -224,9 +230,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() {
@@ -259,8 +263,13 @@ $(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));
+    $("#header").addClass("closed");
+    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) {