Browse Source

Merge pull request #1374 from Alkarex/init-confirm

init confirm after DOM load
Alexandre Alapetite 9 years ago
parent
commit
a5f849b930
2 changed files with 2 additions and 1 deletions
  1. 1 0
      CHANGELOG.md
  2. 1 1
      p/scripts/main.js

+ 1 - 0
CHANGELOG.md

@@ -10,6 +10,7 @@
 * Bug fixing
 	* Fix bug in estimating last user activity [#1358](https://github.com/FreshRSS/FreshRSS/issues/1358)
 	* PostgreSQL: fix bug when updating cached values [#1360](https://github.com/FreshRSS/FreshRSS/issues/1360)
+	* Fix bug in confirmation before marking as read [#1348](https://github.com/FreshRSS/FreshRSS/issues/1348)
 	* Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363)
 
 

+ 1 - 1
p/scripts/main.js

@@ -1354,7 +1354,6 @@ function init_beforeDOM() {
 		window.setTimeout(init_beforeDOM, 100);
 		return;
 	}
-	init_confirm_action();
 	if (['normal', 'reader', 'global'].indexOf(context.current_view) >= 0) {
 		inject_script('jquery.sticky-kit.min.js');
 		init_normal();
@@ -1372,6 +1371,7 @@ function init_afterDOM() {
 	init_notifications();
 	$stream = $('#stream');
 	if ($stream.length > 0) {
+		init_confirm_action();
 		init_load_more($stream);
 		init_posts();
 		init_nav_entries();