From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sat, 5 Oct 2013 00:49:18 +0000 (-0700)
Subject: Implement closing sidebar
X-Git-Tag: live~4615^2~218
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/32645dd8565e7bbad75ab4a03a6b25c4f14e4bda

Implement closing sidebar
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 3dd9e78d8..db858c7c1 100644
--- 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);
       });
diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index d87bf637b..5c600fe87 100644
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -27,6 +27,8 @@ OSM.ChangesetList = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     $("#history_tab").addClass("current");
+    $("#sidebar").removeClass("minimized");
+    map.invalidateSize();
     $('#sidebar_content').load(path, page.load);
   };
 
diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 70684eca9..51ad1e3e2 100644
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -50,6 +50,8 @@ OSM.Export = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     $("#export_tab").addClass("current");
+    $("#sidebar").removeClass("minimized");
+    map.invalidateSize();
     $('#sidebar_content').load(path, page.load);
   };
 
diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index d881facbc..132447ec5 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -38,6 +38,8 @@ OSM.Search = function(map) {
   page.pushstate = page.popstate = function(path) {
     var params = querystring.parse(path.substring(path.indexOf('?') + 1));
     $("#query").val(params.query);
+    $("#sidebar").removeClass("minimized");
+    map.invalidateSize();
     $("#sidebar_content").load(path, page.load);
   };
 
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index bef955509..6f702e5ed 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -590,6 +590,16 @@ nav.secondary {
     }
   }
 
+  #sidebar.minimized {
+    position: absolute;
+    z-index: 1000;
+    height: auto;
+
+    #sidebar_content {
+      display: none;
+    }
+  }
+
   #map {
     height: 100%;
     overflow: hidden;