Consolidate search-related JavaScript

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 3dd9e78d800581596c1943a8a795e1567ea47f36..59335ff849e60d3d08e2c93d14f967558bd3b4e6 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -222,9 +222,11 @@ $(document).ready(function () {
   initializeNotes(map);
 
   OSM.Index = function(map) {
-    var page = {};
+    var page = {}, minimized = false;
 
     page.pushstate = page.popstate = function(path) {
+      if (minimized) $("#sidebar").addClass("minimized");
+      map.invalidateSize();
       $("#view_tab").addClass("current");
       $('#sidebar_content').load(path);
     };
@@ -233,6 +235,14 @@ $(document).ready(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;
   };
 
@@ -240,6 +250,8 @@ $(document).ready(function () {
     var page = {};
 
     page.pushstate = page.popstate = function(path, type, id) {
+      $("#sidebar").removeClass("minimized");
+      map.invalidateSize();
       $('#sidebar_content').load(path, function() {
         page.load(path, type, id);
       });
@@ -271,6 +283,7 @@ $(document).ready(function () {
   });
 
   $(document).on("click", "a", function(e) {
+    if (e.isPropagationStopped()) return;
     if (router(this.pathname + this.search + this.hash)) e.preventDefault();
   });