Fix mobile menu and reduced sidebar height

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index ef23e340d36a6015896e7dd2d82c967ea8b3a9a5..1ea1d7c7f8c70060706e5ffc470279972f1a62b8 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -24,15 +24,20 @@ $(document).ready(function () {
 
   map.hash = L.hash(map);
 
 
   map.hash = L.hash(map);
 

-  $(window).on('popstate', function() {
-    map.hash.update();
+  $(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 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({
 
   var layers = [
     new L.OSM.Mapnik({

-      attribution: copyright,
+      attribution: copyright + " ♥ " + donate,

       code: "M",
       keyid: "mapnik",
       name: I18n.t("javascripts.map.base.standard")
       code: "M",
       keyid: "mapnik",
       name: I18n.t("javascripts.map.base.standard")


@@ -226,27 +231,14 @@ $(document).ready(function () {
   initializeNotes(map);
 
   OSM.Index = function(map) {
   initializeNotes(map);
 
   OSM.Index = function(map) {

-    var page = {}, minimized = false;
+    var page = {}, minimized = $('#sidebar').hasClass('minimized');

 
     page.pushstate = page.popstate = function(path) {
       if (minimized) $("#sidebar").addClass("minimized");
       map.invalidateSize();
 
     page.pushstate = page.popstate = function(path) {
       if (minimized) $("#sidebar").addClass("minimized");
       map.invalidateSize();

-      $("#view_tab").addClass("current");

       $('#sidebar_content').load(path);
     };
 
       $('#sidebar_content').load(path);
     };
 

-    page.unload = function() {
-      $("#view_tab").removeClass("current");
-    };
-
-    page.minimizeSidebar = function() {
-      $("#sidebar").addClass("minimized");
-      map.invalidateSize();
-      minimized = true;
-    };
-
-    $(document).on("click", "#sidebar_content .close", page.minimizeSidebar);
-

     return page;
   };
 
     return page;
   };
 


@@ -262,6 +254,8 @@ $(document).ready(function () {
     };
 
     page.load = function(path, type, id) {
     };
 
     page.load = function(path, type, id) {

+      $("#sidebar").removeClass("minimized");
+

       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 
       if (type === 'note') {
       if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return;
 
       if (type === 'note') {


@@ -292,8 +286,8 @@ $(document).ready(function () {
   });
 
   $(document).on("click", "a", function(e) {
   });
 
   $(document).on("click", "a", function(e) {

-    if (e.isPropagationStopped()) return;
-    if (OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();
+    if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
+    if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault();

   });
 
   $("#search_form").on("submit", function(e) {
   });
 
   $("#search_form").on("submit", function(e) {


@@ -303,6 +297,22 @@ $(document).ready(function () {
 
   $("#describe_location").on("click", function(e) {
     e.preventDefault();
 
   $("#describe_location").on("click", function(e) {
     e.preventDefault();

-    OSM.route("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+    var precision = zoomPrecision(map.getZoom());
+    OSM.route("/search?query=" + encodeURIComponent(
+      map.getCenter().lat.toFixed(precision) + "," +
+      map.getCenter().lng.toFixed(precision)));
+  });
+
+  function removeSidebar() {
+    if ($(window).width() < 721) {
+      $('#sidebar').addClass("minimized");
+    }
+  }
+
+  $(window).resize(function() {
+    removeSidebar();

   });
   });

+
+  removeSidebar();
+

 });
 });