Stop query button disabling query mode once it is active

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

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 01a8a1f69e2ed212d4e3383504c6a81b3fbd6669..2a84207ec55fe9b35f800cfdc0064fc9829b8be8 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,7 +1,9 @@
 //= require jquery.simulate
 
 OSM.Query = function(map) {
-  var queryButton = $(".control-query .control-button"),
+  var protocol = document.location.protocol === "https:" ? "https:" : "http:",
+    url = protocol + OSM.OVERPASS_URL,
+    queryButton = $(".control-query .control-button"),
     uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
     marker;
 
@@ -20,9 +22,9 @@ OSM.Query = function(map) {
     if (queryButton.hasClass("disabled")) return;
 
     if (queryButton.hasClass("active")) {
-      disableQueryMode();
-
-      OSM.router.route("/");
+      if ($("#content").hasClass("overlay-sidebar")) {
+        disableQueryMode();
+      }
     } else {
       enableQueryMode();
     }
@@ -163,7 +165,7 @@ OSM.Query = function(map) {
     }
 
     $section.data("ajax", $.ajax({
-      url: OSM.OVERPASS_URL,
+      url: url,
       method: "POST",
       data: {
         data: "[timeout:5][out:json];" + query,
@@ -203,7 +205,7 @@ OSM.Query = function(map) {
         $section.find(".loader").stopTime("loading").hide();
 
         $("<li>")
-          .text(I18n.t("javascripts.query." + status, { server: OSM.OVERPASS_URL, error: error }))
+          .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
           .appendTo($ul);
       }
     }));