public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-14 04:55:55 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Richard Beales
2013-03-21 18:57:21 +00:00
parent f1fdfbea43 3a693fa76f
commit 96f19f11d7
53 changed files with 7326 additions and 4114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/FeedTree.js
View File

@@ -165,6 +165,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
if (id.match("CAT:")) {
loading = dojo.doc.createElement('img');
loading.className = 'loadingNode';
loading.src = 'images/blank_icon.gif';
dojo.place(loading, tnode.labelNode, 'after');
tnode.loadingNode = loading;
}

6
js/functions.js
View File

@@ -201,13 +201,13 @@ function notify_real(msg, no_hide, n_type) {
n.className = "notify";
} else if (n_type == 2) {
n.className = "notifyProgress";
msg = "<img src='"+getInitParam("sign_progress")+"'> " + msg;
msg = "<img src='images/indicator_white.gif'> " + msg;
} else if (n_type == 3) {
n.className = "notifyError";
msg = "<img src='"+getInitParam("sign_excl")+"'> " + msg;
msg = "<img src='images/sign_excl.svg'> " + msg;
} else if (n_type == 4) {
n.className = "notifyInfo";
msg = "<img src='"+getInitParam("sign_info")+"'> " + msg;
msg = "<img src='images/sign_info.svg'> " + msg;
}
// msg = "<img src='images/live_com_loading.gif'> " + msg;

18
js/tt-rss.js
View File

@@ -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) {