aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorbanux <banux@helheim.net>2013-10-27 07:47:14 +0100
committerbanux <banux@helheim.net>2013-10-27 07:47:14 +0100
commitf616ab60efc502b919b9b72f81aee2975b2e8465 (patch)
tree0e44e51550a58c4cd116a4bfd53513e39ec83198
parent363bc4eb8642d464cc0c099f7ab72a425b56b463 (diff)
downloadwallabag-f616ab60efc502b919b9b72f81aee2975b2e8465.tar.gz
wallabag-f616ab60efc502b919b9b72f81aee2975b2e8465.tar.zst
wallabag-f616ab60efc502b919b9b72f81aee2975b2e8465.zip
use 2 seprate variable for autoclosing windows to avoid to quick closing when sharing, the popup can be close before the link is save
-rw-r--r--inc/poche/Poche.class.php2
-rw-r--r--themes/default/js/autoClose.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 5d807268..3ecaf084 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -361,7 +361,7 @@ class Poche
361 if ($autoclose == TRUE) { 361 if ($autoclose == TRUE) {
362 Tools::redirect('?view=home'); 362 Tools::redirect('?view=home');
363 } else { 363 } else {
364 Tools::redirect('?view=home&autoclose=true'); 364 Tools::redirect('?view=home&closewin=true');
365 } 365 }
366 } 366 }
367 break; 367 break;
diff --git a/themes/default/js/autoClose.js b/themes/default/js/autoClose.js
index 3035d423..e9145b7e 100644
--- a/themes/default/js/autoClose.js
+++ b/themes/default/js/autoClose.js
@@ -1,6 +1,6 @@
1$(document).ready(function() { 1$(document).ready(function() {
2 current_url = window.location.href 2 current_url = window.location.href
3 if (current_url.match("&autoclose=true")) { 3 if (current_url.match("&closewin=true")) {
4 window.close(); 4 window.close();
5 } 5 }
6}); \ No newline at end of file 6});