From ff02fd8aca56a63e8caf3b9f87de8a677dd419e9 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Sun, 2 Nov 2014 11:15:36 -0500
Subject: [PATCH] Improving JavaScript for popup forms

---
 themes/default/js/popupForm.js | 69 +++++++++++++++++++++++++++-------
 themes/default/js/saveLink.js  | 23 +++++++-----
 2 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js
index eb6d1ae..d233e60 100644
--- a/themes/default/js/popupForm.js
+++ b/themes/default/js/popupForm.js
@@ -1,29 +1,72 @@
 $(document).ready(function() {
 
     $("#search-form").hide();
+    $("#bagit-form").hide();
 
-    function closeSearch() {
+    //---------------------------------------------------------------------------
+    // Toggle the "Search" popup in the sidebar
+    //---------------------------------------------------------------------------
+    function toggleSearch() {
         $("#search-form").toggle();
         $("#search").toggleClass("current");
+        $("#search").toggleClass("active-current");
         $("#search-arrow").toggleClass("arrow-down");
+        if ($("#search").hasClass("current")) {
+            $("#content").addClass("opacity03");
+        } else {
+            $("#content").removeClass("opacity03");
+        }
+    }
+
+    //---------------------------------------------------------------------------
+    // Toggle the "Save a Link" popup in the sidebar
+    //---------------------------------------------------------------------------
+    function toggleBagit() {
+        $("#bagit-form").toggle();
+        $("#bagit").toggleClass("current");
+        $("#bagit").toggleClass("active-current");
+        $("#bagit-arrow").toggleClass("arrow-down");
+        if ($("#bagit").hasClass("current")) {
+            $("#content").addClass("opacity03");
+        } else {
+            $("#content").removeClass("opacity03");
+        }
+    }
+
+    //---------------------------------------------------------------------------
+    // Close all #links popups in the sidebar
+    //---------------------------------------------------------------------------
+    function closePopups() {
+        $("#links .messages").hide();
+        $("#links > li > a").removeClass("active-current");
+        $("#links > li > a").removeClass("current");
+        $("[id$=-arrow]").removeClass("arrow-down");
+        $("#content").removeClass("opacity03");
     }
 
     $("#search").click(function(){
-        closeSearch();
-        // if other popup is already shown
-        if ($("#bagit-form").length != 0) {
-            $("#bagit").removeClass("active-current");
-            $('#content').removeClass("opacity03");
-            $("#bagit").removeClass("current");
-            $("#bagit-arrow").removeClass("arrow-down");
-            $("#bagit-form").hide();
-        }
-        $('#searchfield').focus();
+        closePopups();
+        toggleSearch();
+        $("#searchfield").focus();
+    });
+
+    $("#bagit").click(function(){
+        closePopups();
+        toggleBagit();
+        $("#plainurl").focus();
     });
 
     $("#search-form-close").click(function(){
-        closeSearch();
+        toggleSearch();
     });
 
+    $("#bagit-form-close").click(function(){
+        toggleBagit();
+    });
 
-});
\ No newline at end of file
+    // $("#").click(function(){
+    //     toggleSearch();
+    // });
+
+
+});
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index b52b8a2..a7acd84 100755
--- a/themes/default/js/saveLink.js
+++ b/themes/default/js/saveLink.js
@@ -36,18 +36,21 @@ $.fn.ready(function() {
     $('#plainurl').focus();
   }
 
+	//---------------------------------------------------------------------------
+	// These two functions are now taken care of in popupForm.js
+	//---------------------------------------------------------------------------
 
-  $bagit.click(function(){
-    $bagit.toggleClass("current");
-    $("#bagit-arrow").toggleClass("arrow-down");
-    toggleSaveLinkForm();
-  });
+  // $bagit.click(function(){
+  //   $bagit.toggleClass("current");
+  //   $("#bagit-arrow").toggleClass("arrow-down");
+  //   toggleSaveLinkForm();
+  // });
 
-  $("#bagit-form-close").click(function(){
-    $bagit.removeClass("current");
-    $("#bagit-arrow").removeClass("arrow-down");
-    toggleSaveLinkForm();
-  });
+  // $("#bagit-form-close").click(function(){
+  //   $bagit.removeClass("current");
+  //   $("#bagit-arrow").removeClass("arrow-down");
+  //   toggleSaveLinkForm();
+  // });
 
 
   //send "bag it link" form request via ajax