diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-11-16 20:02:08 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-11-16 20:02:08 +0100 |
| commit | a5f849b9306094659c2874724ca825b8893aaa16 (patch) | |
| tree | ee7f666616c150f63de26459602f5e557b8788d1 | |
| parent | 2cdc83d24d0c90df1410d3b5672542a2e4c146c2 (diff) | |
| parent | c08984cbfa01bc6712fbceaef2148834ec639a38 (diff) | |
Merge pull request #1374 from Alkarex/init-confirm
init confirm after DOM load
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | p/scripts/main.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dcb1bfec..874fbe7ed 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/p/scripts/main.js b/p/scripts/main.js index 078bec682..14e0c5be5 100644 --- a/p/scripts/main.js +++ b/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(); |