moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 11:22:17 -05:00
Code Issues Releases Wiki Activity

Merge pull request #868 from wallabag/popupoverlap

Browse Source 
fix for #830
This commit is contained in:
Nicolas Lœuillet 2014-10-15 16:53:06 +02:00
commit 691a03f176
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
themes/default/js/popupForm.js
View File

@ -10,6 +10,14 @@ $(document).ready(function() {
$("#search").click(function(){ $("#search").click(function(){
closeSearch(); 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(); $('#searchfield').focus();
}); });

7
themes/default/js/saveLink.js
View File

@ -13,7 +13,7 @@ $.fn.ready(function() {
$bagit.toggleClass("active-current"); $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 ( $bagit.length === 0 ) {
if ( event !== 'undefined' && event ) { if ( event !== 'undefined' && event ) {
$bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200}); $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(); $bagitForm.toggle();
$('#content').toggleClass("opacity03"); $('#content').toggleClass("opacity03");
if (url !== 'undefined' && url) { if (url !== 'undefined' && url) {