Merge pull request #932 from wallabag/dev1.8.1

1.8.1

2 files changed, 77 insertions, 18 deletions

diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js
index a32e6e70..d233e600 100644
--- a/themes/default/js/popupForm.js
+++ b/themes/default/js/popupForm.js
@@ -1,21 +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();
-        $('#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();
     });
 
+    // $("#").click(function(){
+    //     toggleSearch();
+    // });
+
 
-});
\ No newline at end of file
+});
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index 6dbce97e..a7acd84c 100755
--- a/themes/default/js/saveLink.js
+++ b/themes/default/js/saveLink.js
@@ -13,7 +13,7 @@ $.fn.ready(function() {
 
     $bagit.toggleClass("active-current");
 
-    //only if bagiti link is not presented on page
+    //only if bag-it link is not presented on page
     if ( $bagit.length === 0 ) {
       if ( event !== 'undefined' && event ) {
         $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200});
@@ -23,6 +23,11 @@ $.fn.ready(function() {
       }
     }
 
+    if ($("#search-form").length != 0) {
+        $("#search").removeClass("current");
+        $("#search-arrow").removeClass("arrow-down");
+        $("#search-form").hide();
+    }
     $bagitForm.toggle();
     $('#content').toggleClass("opacity03");
     if (url !== 'undefined' && url) {
@@ -31,18 +36,21 @@ $.fn.ready(function() {
     $('#plainurl').focus();
   }
 
-
-  $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();
-  });
+        //---------------------------------------------------------------------------
+        // These two functions are now taken care of in popupForm.js
+        //---------------------------------------------------------------------------
+
+  // $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();
+  // });
 
 
   //send "bag it link" form request via ajax