Merge pull request #634 from wallabag/dev1.6.1b

1.6.1

2 files changed, 21 insertions, 1 deletions

diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js
new file mode 100644
index 00000000..06be3f0c
--- /dev/null
+++ b/themes/default/js/popupForm.js
@@ -0,0 +1,20 @@
+$(document).ready(function() {
+
+    $("#search-form").hide();
+
+    function closeSearch() {
+        $("#search-form").toggle();
+        $("#search").toggleClass("current");
+        $("#search-arrow").toggleClass("arrow-down");
+    }
+
+    $("#search").click(function(){
+        closeSearch();
+    });
+
+    $("#search-form-close").click(function(){
+        closeSearch();
+    });
+
+
+});
\ No newline at end of file
diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js
index ccc00d1e..bee453c0 100755
--- a/themes/default/js/saveLink.js
+++ b/themes/default/js/saveLink.js
@@ -75,7 +75,7 @@ $.fn.ready(function() {
    ========================================================================== */
 
   $(window).keydown(function(e){
-    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || e.keyCode == 27 ) {
+    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || (e.keyCode == 27 && $bagitForm.is(':visible') ) ) {
       $bagit.removeClass("current");
       $("#bagit-arrow").removeClass("arrow-down");
       toggleSaveLinkForm();