Prevent empty search

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index e01ff3cb90008f61dcb37596750d1ddadd59d590..f6cb0223038c145e79852b6a0e84544d3fb9f84f 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -11,8 +11,42 @@
 //= require index/notes
 //= require index/history
 //= require index/note
 //= require index/notes
 //= require index/history
 //= require index/note

+//= require index/new_note

 //= require router
 
 //= 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()
+      .load(path, function(a, b, xhr) {
+        clearTimeout(loaderTimeout);
+        $('#sidebar_loader').hide();
+        if (xhr.getResponseHeader('X-Page-Title')) {
+          document.title = xhr.getResponseHeader('X-Page-Title');
+        }
+        if (callback) {
+          callback();
+        }
+      });
+  };
+})();
+

 $(document).ready(function () {
   var params = OSM.mapParams();
 
 $(document).ready(function () {
   var params = OSM.mapParams();
 


@@ -23,73 +57,7 @@ $(document).ready(function () {
 
   map.attributionControl.setPrefix('');
 
 
   map.attributionControl.setPrefix('');
 

-  map.hash = L.hash(map);
-
-  $(window).on('popstate', function(e) {
-    // popstate is triggered when the hash changes as well as on actual navigation
-    // events. We want to update the hash on the latter and not the former.
-    if (e.originalEvent.state) {
-      map.hash.update();
-    }
-  });
-
-  var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
-  var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'});
-
-  var layers = [
-    new L.OSM.Mapnik({
-      attribution: copyright + " &hearts; " + donate,
-      code: "M",
-      keyid: "mapnik",
-      name: I18n.t("javascripts.map.base.standard")
-    }),
-    new L.OSM.CycleMap({
-      attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-      code: "C",
-      keyid: "cyclemap",
-      name: I18n.t("javascripts.map.base.cycle_map")
-    }),
-    new L.OSM.TransportMap({
-      attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-      code: "T",
-      keyid: "transportmap",
-      name: I18n.t("javascripts.map.base.transport_map")
-    }),
-    new L.OSM.MapQuestOpen({
-      attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
-      code: "Q",
-      keyid: "mapquest",
-      name: I18n.t("javascripts.map.base.mapquest")
-    }),
-    new L.OSM.HOT({
-      attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
-      code: "H",
-      keyid: "hot",
-      name: I18n.t("javascripts.map.base.hot")
-    })
-  ];
-
-  function updateLayers(params) {
-    var layerParam = params.layers || "M";
-    var layersAdded = "";
-
-    for (var i = layers.length - 1; i >= 0; i--) {
-      if (layerParam.indexOf(layers[i].options.code) >= 0) {
-        map.addLayer(layers[i]);
-        layersAdded = layersAdded + layers[i].options.code;
-      } else if (i == 0 && layersAdded == "") {
-        map.addLayer(layers[i]);
-      } else {
-        map.removeLayer(layers[i]);
-      }
-    }
-  }
-
-  updateLayers(params);
-
-  $(window).on("hashchange", function () {
-    updateLayers(OSM.mapParams());
-  });
+  map.updateLayers(params.layers);

 
   map.on("baselayerchange", function (e) {
     if (map.getZoom() > e.layer.options.maxZoom) {
 
   map.on("baselayerchange", function (e) {
     if (map.getZoom() > e.layer.options.maxZoom) {


@@ -97,12 +65,6 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

-  map.noteLayer = new L.LayerGroup();
-  map.noteLayer.options = {code: 'N'};
-
-  map.dataLayer = new L.OSM.DataLayer(null);
-  map.dataLayer.options.code = 'D';
-

   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})


@@ -121,7 +83,7 @@ $(document).ready(function () {
 
   L.OSM.layers({
     position: position,
 
   L.OSM.layers({
     position: position,

-    layers: layers,
+    layers: map.baseLayers,

     sidebar: sidebar
   }).addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 


@@ -168,9 +130,6 @@ $(document).ready(function () {
     var expiry = new Date();
     expiry.setYear(expiry.getFullYear() + 10);
     $.cookie("_osm_location", cookieContent(map), { expires: expiry });
     var expiry = new Date();
     expiry.setYear(expiry.getFullYear() + 10);
     $.cookie("_osm_location", cookieContent(map), { expires: expiry });

-
-    // Trigger hash update on layer changes.
-    map.hash.onMapMove();

   });
 
   if (OSM.PIWIK) {
   });
 
   if (OSM.PIWIK) {


@@ -233,19 +192,23 @@ $(document).ready(function () {
   OSM.Index = function(map) {
     var page = {};
 
   OSM.Index = function(map) {
     var page = {};
 

-    page.pushstate = page.popstate = function(path) {
+    page.pushstate = function(path) {

       $("#content").addClass("overlay-sidebar");
       $("#content").addClass("overlay-sidebar");

-      map.invalidateSize();
-      $('#sidebar_content').load(path + "?xhr=1", function(a, b, xhr) {
-        if (xhr.getResponseHeader('X-Page-Title')) {
-          document.title = xhr.getResponseHeader('X-Page-Title');
-        }
-      });
+      map.invalidateSize({pan: false})
+        .panBy([-300, 0], {animate: false});
+      OSM.loadSidebarContent(path);
+    };
+
+    page.popstate = function(path) {
+      $("#content").addClass("overlay-sidebar");
+      map.invalidateSize({pan: false});
+      OSM.loadSidebarContent(path);

     };
 
     page.unload = function() {
     };
 
     page.unload = function() {

+      map.panBy([300, 0], {animate: false});

       $("#content").removeClass("overlay-sidebar");
       $("#content").removeClass("overlay-sidebar");

-      map.invalidateSize();
+      map.invalidateSize({pan: false});

     };
 
     return page;
     };
 
     return page;


@@ -255,10 +218,7 @@ $(document).ready(function () {
     var page = {};
 
     page.pushstate = page.popstate = function(path, type, id) {
     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);
       });
     };
         page.load(path, type, id);
       });
     };


@@ -266,11 +226,7 @@ $(document).ready(function () {
     page.load = function(path, type, id) {
       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 
     page.load = function(path, type, id) {
       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 

-      if (type === 'note') {
-        map.noteLayer.showNote(parseInt(id));
-      } else {
-        map.addObject({type: type, id: parseInt(id)}, {zoom: true});
-      }
+      map.addObject({type: type, id: parseInt(id)}, {zoom: window.location.hash == ""});

     };
 
     page.unload = function() {
     };
 
     page.unload = function() {


@@ -283,11 +239,12 @@ $(document).ready(function () {
   var history = OSM.History(map),
     note = OSM.Note(map);
 
   var history = OSM.History(map),
     note = OSM.Note(map);
 

-  OSM.route = OSM.Router({
+  OSM.route = OSM.Router(map, {

     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/history":                    history,
     "/":                           OSM.Index(map),
     "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/history":                    history,

+    "/new_note":                   OSM.NewNote(map),

     "/user/:display_name/edits":   history,
     "/browse/friends":             history,
     "/browse/nearby":              history,
     "/user/:display_name/edits":   history,
     "/browse/friends":             history,
     "/browse/nearby":              history,


@@ -303,7 +260,12 @@ $(document).ready(function () {
   $(".search_form").on("submit", function(e) {
     e.preventDefault();
     $("header").addClass("closed");
   $(".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) {
   });
 
   $(".describe_location").on("click", function(e) {