diff options
| author | Andrew Dolgov <[email protected]> | 2013-05-07 15:36:14 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-05-07 15:36:14 +0400 |
| commit | 82076ce53113be9cc053f8740356e7e1b81e5643 (patch) | |
| tree | 5eba36805f593ec7dd0aad671b5bcca0ae01cf53 /js/feedlist.js | |
| parent | 66af65f14b4f3c670bb3f9ca7b1c80081f9281d1 (diff) | |
| parent | 23923fb29b345c1eea5b70a6df4d30395425bf37 (diff) | |
Merge branch 'master' into css-feedtree-counter
Conflicts:
tt-rss.css
Diffstat (limited to 'js/feedlist.js')
| -rw-r--r-- | js/feedlist.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/feedlist.js b/js/feedlist.js index f4e07517e..932297be8 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -139,6 +139,7 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) { onComplete: function(transport) { setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif'); headlines_callback2(transport, offset, background, infscroll_req); + PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]); } }); } catch (e) { @@ -150,6 +151,8 @@ function feedlist_init() { try { console.log("in feedlist init"); + loading_set_progress(50); + document.onkeydown = hotkey_handler; setTimeout("hotkey_prefix_timeout()", 5*1000); |