diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-28 18:18:30 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-28 18:18:30 +0400 |
| commit | b8c9341afafddffa930b93b72127958fae872100 (patch) | |
| tree | 5771c6e43030e84732142e0e096d1f8dd669cadd | |
| parent | d48398e647e8d4425629c4a5ecb1193c15732924 (diff) | |
| parent | 712032589c584df154ab4e97c0f1bd5289d4fb1a (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
| -rw-r--r-- | js/PluginHost.js | 2 | ||||
| -rw-r--r-- | js/functions.js | 13 | ||||
| -rw-r--r-- | js/tt-rss.js | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/js/PluginHost.js b/js/PluginHost.js index de4c57b60..668d215f9 100644 --- a/js/PluginHost.js +++ b/js/PluginHost.js @@ -8,6 +8,8 @@ var PluginHost = { HOOK_FEED_LOADED: 5, HOOK_ARTICLE_EXPANDED: 6, HOOK_ARTICLE_COLLAPSED: 7, + HOOK_PARAMS_LOADED: 8, + HOOK_RUNTIME_INFO_LOADED: 9, hooks: [], register: function (name, callback) { if (typeof(this.hooks[name]) == 'undefined') diff --git a/js/functions.js b/js/functions.js index 8442e1c9f..8691c1ee5 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1269,16 +1269,17 @@ function backend_sanity_check_callback(transport) { if (params) { console.log('reading init-params...'); - if (params) { - for (k in params) { - var v = params[k]; - console.log("IP: " + k + " => " + v); + for (k in params) { + var v = params[k]; + console.log("IP: " + k + " => " + v); - if (k == "label_base_index") _label_base_index = parseInt(v); - } + if (k == "label_base_index") _label_base_index = parseInt(v); } init_params = params; + + // PluginHost might not be available on non-index pages + window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, init_params); } sanity_check_done = true; diff --git a/js/tt-rss.js b/js/tt-rss.js index a7518959c..2a741ab2d 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -753,6 +753,8 @@ function parse_runtime_info(data) { init_params[k] = v; notify(''); } + + PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data); } function collapse_feedlist() { @@ -992,7 +994,7 @@ function handle_rpc_json(transport, scheduled_call) { if (counters) parse_counters(counters, scheduled_call); - var runtime_info = reply['runtime-info'];; + var runtime_info = reply['runtime-info']; if (runtime_info) parse_runtime_info(runtime_info); |