moparisthebest
/
wallabag
mirror of https://github.com/moparisthebest/wallabag
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #919 from jsit/popupjs_ 

Improving JavaScript for popup forms
This commit is contained in:
Nicolas Lœuillet 2014-11-03 06:46:18 +01:00
parent 893b8e4cef ff02fd8aca
commit 20bb3f7f2a
2 changed files with 69 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
});
// $("#").click(function(){
// toggleSearch();
// });
});

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

@ -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