diff options
| author | Richard Beales <[email protected]> | 2013-03-21 18:57:21 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-21 18:57:21 +0000 |
| commit | 96f19f11d741617b997b4533df50ff8a5b17f46b (patch) | |
| tree | 7ae4cc7c4b7192336d86bf4df0dee544f339f168 /js/tt-rss.js | |
| parent | f1fdfbea433c834ae7f09b4ef23f23d5efa069d4 (diff) | |
| parent | 3a693fa76f0cc6a38aa5642a08b48f58c29758bc (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js/tt-rss.js')
| -rw-r--r-- | js/tt-rss.js | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/js/tt-rss.js b/js/tt-rss.js index c80e8737d..1d6540dbb 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -185,7 +185,7 @@ function updateTitle() { } if (global_unread > 0) { - tmp = tmp + " (" + global_unread + ")"; + tmp = "(" + global_unread + ") " + tmp; } if (window.fluid) { @@ -450,6 +450,12 @@ function parse_runtime_info(data) { return; } + if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) { + if (parseInt(getInitParam("dep_ts")) < parseInt(v)) { + window.location.reload(); + } + } + if (k == "daemon_is_running" && v != 1) { notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true); return; @@ -790,6 +796,14 @@ function hotkey_handler(e) { case "collapse_sidebar": collapse_feedlist(); return false; + case "toggle_embed_original": + if (typeof embedOriginalArticle != "undefined") { + if (getActiveArticleId()) + embedOriginalArticle(getActiveArticleId()); + } else { + alert(__("Please enable embed_original plugin first.")); + } + return false; case "toggle_widescreen": if (!isCdmMode()) { _widescreen_mode = !_widescreen_mode; @@ -932,6 +946,8 @@ function handle_rpc_json(transport, scheduled_call) { function switchPanelMode(wide) { try { + if (isCdmMode()) return; + article_id = getActiveArticleId(); if (wide) { |