Add clearer close action, refactor base layer code

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

diff --git a/app/assets/javascripts/sidebar.js b/app/assets/javascripts/sidebar.js
index 4ef379bf5cef51055d3e1b48ae65470da08bb464..912197b9f2c380cfcc4732cf7033901d5b8987bf 100644 (file)
--- a/app/assets/javascripts/sidebar.js
+++ b/app/assets/javascripts/sidebar.js
@@ -1,40 +1,21 @@
-var openSidebar;
+function openSidebar(options) {
+  options = options || {};
 
-(function () {
-  var onclose;
+  $("#sidebar").trigger("closed");
 
-  openSidebar = function(options) {
-    options = options || {};
+  if (options.title) { $("#sidebar_title").html(options.title); }
 
-    if (onclose) {
-      onclose();
-      onclose = null;
-    }
+  $("#sidebar").width(options.width || "30%");
+  $("#sidebar").css("display", "block").trigger("opened");
+}
 
-    if (options.title) { $("#sidebar_title").html(options.title); }
+function closeSidebar() {
+  $("#sidebar").css("display", "none").trigger("closed");
+}
 
-    if (options.width) { $("#sidebar").width(options.width); }
-    else { $("#sidebar").width("30%"); }
-
-    $("#sidebar").css("display", "block");
-
-    $("#sidebar").trigger("opened");
-
-    onclose = options.onclose;
-  };
-
-  $(document).ready(function () {
-    $(".sidebar_close").click(function (e) {
-      $("#sidebar").css("display", "none");
-
-      $("#sidebar").trigger("closed");
-
-      if (onclose) {
-        onclose();
-        onclose = null;
-      }
-
-      e.preventDefault();
-    });
+$(document).ready(function () {
+  $(".sidebar_close").click(function (e) {
+    closeSidebar();
+    e.preventDefault();
   });
-})();
+});