From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Feb 2010 23:35:55 +0000 (+0000)
Subject: Don't close the sidebar when the visibility of the data layer changes
X-Git-Tag: live~6377^2~5
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1997f1f662dddc8fcc9997ef301dacd9f73e075b?ds=sidebyside

Don't close the sidebar when the visibility of the data layer changes
if the browser isn't active. Closes #2684.
---

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 220295663..b045bc9ea 100644
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -2,7 +2,6 @@ page.replace_html :sidebar_title, t('browse.start_rjs.data_frame_title')
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var browseBoxControl;
-  var browseActive;
   var browseMode = "auto";
   var browseBounds;
   var browseFeatureList;
@@ -15,7 +14,7 @@ page << <<EOJ
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {
-    browseActive = true;
+    map.dataLayer.active = true;
 
     openSidebar({ onclose: stopBrowse });
 
@@ -47,8 +46,8 @@ page << <<EOJ
   }
 
   function stopBrowse() {
-    if (browseActive) {
-      browseActive = false;
+    if (map.dataLayer.active) {
+      map.dataLayer.active = false;
 
       if (browseSelectControl) {   
         browseSelectControl.destroy();  
@@ -154,7 +153,7 @@ page << <<EOJ
   }    
 
   function customDataLoader(request) {
-    if (browseActive) {
+    if (this.map.dataLayer.active) {
       var doc = request.responseXML;
 
       if (!doc || !doc.documentElement) {
@@ -238,9 +237,9 @@ page << <<EOJ
   }
 
   function dataLoaded() {
-    if (browseActive) {
+    if (this.map.dataLayer.active) {
       clearStatus();
-        
+
       browseObjectList = document.createElement("div")
 
       var heading = document.createElement("p");
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 150bdce4d..0602b6f11 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -182,7 +182,7 @@ end
   function toggleData() {
     if (map.dataLayer.visibility) {
       <%= remote_function :url => { :controller => 'browse', :action => 'start' } %>
-    } else {
+    } else if (map.dataLayer.active) {
       closeSidebar();
     }
   }