Don't call formatChanged() when disabling XML output as it has side effects.

[rails.git] / app / views / site / _sidebar.rhtml

diff --git a/app/views/site/_sidebar.rhtml b/app/views/site/_sidebar.rhtml
index 8cf1ce62c114f5828101147a3902a78999bcc21b..d813635905971a9c86a69b8c2b69aed017bca886 100644 (file)
--- a/app/views/site/_sidebar.rhtml
+++ b/app/views/site/_sidebar.rhtml
@@ -11,21 +11,43 @@
 
 <script type="text/javascript">
 <!--
-  function openSidebar() {
-       if (arguments.length) { $("sidebar").style.width = arguments[0]; }
-                        else { $("sidebar").style.width = "30%"; }
+  var onclose;
+
+  function openSidebar(options) {
+    if (onclose) {
+       onclose();
+       onclose = null;
+    }
+
+    if (options.width) { $("sidebar").style.width = options.width; }
+    else { $("sidebar").style.width = "30%"; }
+
     $("sidebar").style.display = "block";
+
     <%= onopen %>
+
+    onclose = options.onclose;
   }
 
   function closeSidebar() {
     $("sidebar").style.display = "none";
+
     <%= onclose %>
+
+    if (onclose) {
+       onclose();
+       onclose = null;
+    }
   }
 
   function updateSidebar(title, content) {
     $("sidebar_title").innerHTML = title;
     $("sidebar_content").innerHTML = content;
   }
+
+  function sidebarOpen(title) {
+    return $("sidebar").style.display == "block" &&
+           $("sidebar_title").innerHTML == title;
+  }
 // -->
 </script>