aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default/js
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-10-15 16:53:06 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-10-15 16:53:06 +0200
commit691a03f1760231f5f5d9fe09da4061a54591cbac (patch)
tree59353e59db20c61168c0d5a19deeba9819d9966d /themes/default/js
parent8fd0512a3cd97d870aa3442c78bbdd034f541c7d (diff)
parent48fb171d7a64dbd1036f9e17cbf4c14304483817 (diff)
downloadwallabag-691a03f1760231f5f5d9fe09da4061a54591cbac.tar.gz
wallabag-691a03f1760231f5f5d9fe09da4061a54591cbac.tar.zst
wallabag-691a03f1760231f5f5d9fe09da4061a54591cbac.zip
Merge pull request #868 from wallabag/popupoverlap
fix for #830
Diffstat (limited to 'themes/default/js')
-rw-r--r--themes/default/js/popupForm.js8
-rwxr-xr-xthemes/default/js/saveLink.js7
2 files changed, 14 insertions, 1 deletions
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() {
10 10
11 $("#search").click(function(){ 11 $("#search").click(function(){
12 closeSearch(); 12 closeSearch();
13 // if other popup is already shown
14 if ($("#bagit-form").length != 0) {
15 $("#bagit").removeClass("active-current");
16 $('#content').removeClass("opacity03");
17 $("#bagit").removeClass("current");
18 $("#bagit-arrow").removeClass("arrow-down");
19 $("#bagit-form").hide();
20 }
13 $('#searchfield').focus(); 21 $('#searchfield').focus();
14 }); 22 });
15 23
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() {
13 13
14 $bagit.toggleClass("active-current"); 14 $bagit.toggleClass("active-current");
15 15
16 //only if bagiti link is not presented on page 16 //only if bag-it link is not presented on page
17 if ( $bagit.length === 0 ) { 17 if ( $bagit.length === 0 ) {
18 if ( event !== 'undefined' && event ) { 18 if ( event !== 'undefined' && event ) {
19 $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200}); 19 $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200});
@@ -23,6 +23,11 @@ $.fn.ready(function() {
23 } 23 }
24 } 24 }
25 25
26 if ($("#search-form").length != 0) {
27 $("#search").removeClass("current");
28 $("#search-arrow").removeClass("arrow-down");
29 $("#search-form").hide();
30 }
26 $bagitForm.toggle(); 31 $bagitForm.toggle();
27 $('#content').toggleClass("opacity03"); 32 $('#content').toggleClass("opacity03");
28 if (url !== 'undefined' && url) { 33 if (url !== 'undefined' && url) {