From: tcit <tcit@tcit.fr>
Date: Wed, 15 Oct 2014 14:47:38 +0000 (+0200)
Subject: fix for #830
X-Git-Tag: 1.8.1^2~28^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=refs%2Fpull%2F868%2Fhead;p=github%2Fwallabag%2Fwallabag.git

fix for #830
---

diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js
index a32e6e70..eb6d1ae2 100644
--- a/themes/default/js/popupForm.js
+++ b/themes/default/js/popupForm.js
@@ -10,6 +10,14 @@ $(document).ready(function() {
 
     $("#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();
     });
 
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index 6dbce97e..b52b8a2c 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) {