$("headlines-frame").setAttribute("is-cat", is_cat ? 1 : 0);
selectFeed(id, is_cat);
+
+ PluginHost.run(PluginHost.HOOK_FEED_SET_ACTIVE, _active_article_id);
} catch (e) {
exception_error("setActiveFeedId", e);
}
var id = String(item.id);
var is_cat = id.match("^CAT:");
var feed = id.substr(id.indexOf(":")+1);
- viewfeed(feed, '', is_cat);
+ viewfeed({feed: feed, is_cat: is_cat});
return false;
},
openOnClick: false,
tree.startup();
+
} catch (e) {
exception_error("updateFeedList", e);
}
new Ajax.Request("backend.php", {
parameters: query_str,
onComplete: function(transport) {
- feedlist_callback2(transport);
+ request_counters(true);
+ viewCurrentFeed();
} });
global_unread = 0;
}
function viewCurrentFeed(method) {
- console.log("viewCurrentFeed");
+ console.log("viewCurrentFeed: " + method);
if (getActiveFeedId() != undefined) {
- viewfeed(getActiveFeedId(), method, activeFeedIsCat());
+ viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), method: method});
}
return false; // block unneeded form submits
}
}
function search() {
- var query = "backend.php?op=dlg&method=search¶m=" +
+ var query = "backend.php?op=feeds&method=search¶m=" +
param_escape(getActiveFeedId() + ":" + activeFeedIsCat());
if (dijit.byId("searchDlg"))
dojo.require("dijit.form.Select");
dojo.require("dijit.form.SimpleTextarea");
dojo.require("dijit.form.TextBox");
+ dojo.require("dijit.form.ComboBox");
dojo.require("dijit.form.ValidationTextBox");
dojo.require("dijit.InlineEditBox");
dojo.require("dijit.layout.AccordionContainer");
if (!genericSanityCheck())
return false;
- loading_set_progress(20);
+ loading_set_progress(30);
+
+ var a = document.createElement('audio');
- var hasAudio = !!((myAudioTag = document.createElement('audio')).canPlayType);
+ var hasAudio = !!a.canPlayType;
var hasSandbox = "sandbox" in document.createElement("iframe");
+ var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
+ var clientTzOffset = new Date().getTimezoneOffset() * 60;
new Ajax.Request("backend.php", {
parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+ hasMp3: hasMp3,
+ clientTzOffset: clientTzOffset,
hasSandbox: hasSandbox},
onComplete: function(transport) {
backend_sanity_check_callback(transport);
var rv = dijit.byId("feedTree").getNextFeed(
getActiveFeedId(), activeFeedIsCat());
- if (rv) viewfeed(rv[0], '', rv[1]);
+ if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
};
hotkey_actions["prev_feed"] = function() {
var rv = dijit.byId("feedTree").getPreviousFeed(
getActiveFeedId(), activeFeedIsCat());
- if (rv) viewfeed(rv[0], '', rv[1]);
+ if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
};
hotkey_actions["next_article"] = function() {
moveToPost('next');
hotkey_actions["prev_article_noscroll"] = function() {
moveToPost('prev', true);
};
+ hotkey_actions["next_article_noexpand"] = function() {
+ moveToPost('next', true, true);
+ };
+ hotkey_actions["prev_article_noexpand"] = function() {
+ moveToPost('prev', true, true);
+ };
hotkey_actions["collapse_article"] = function() {
var id = getActiveArticleId();
var elem = $("CICD-"+id);
- if(elem.visible()) {
- cdmCollapseArticle(null, id);
+
+ if (elem) {
+ if (elem.visible()) {
+ cdmCollapseArticle(null, id);
+ }
+ else {
+ cdmExpandArticle(id);
+ }
}
- else {
- cdmExpandArticle(id);
+ };
+ hotkey_actions["toggle_expand"] = function() {
+ var id = getActiveArticleId();
+ var elem = $("CICD-"+id);
+
+ if (elem) {
+ if (elem.visible()) {
+ cdmCollapseArticle(null, id, false);
+ }
+ else {
+ cdmExpandArticle(id);
+ }
}
};
hotkey_actions["search_dialog"] = function() {
hotkey_actions["edit_tags"] = function() {
var id = getActiveArticleId();
if (id) {
- editArticleTags(id, getActiveFeedId(), isCdmMode());
+ editArticleTags(id);
};
}
hotkey_actions["dismiss_selected"] = function() {
dismissSelectedArticles();
};
+ hotkey_actions["dismiss_read"] = function() {
+ dismissReadArticles();
+ };
hotkey_actions["open_in_new_window"] = function() {
if (getActiveArticleId()) {
openArticleInNewWindow(getActiveArticleId());
};
hotkey_actions["feed_refresh"] = function() {
if (getActiveFeedId() != undefined) {
- viewfeed(getActiveFeedId(), '', activeFeedIsCat());
+ viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
return;
}
};
quickAddFeed();
};
hotkey_actions["feed_debug_update"] = function() {
- window.open("backend.php?op=feeds&method=view&feed=" + getActiveFeedId() +
- "&view_mode=adaptive&order_by=default&update=&m=ForceUpdate&cat=" +
- activeFeedIsCat() + "&DevForceUpdate=1&debug=1&xdebug=1&csrf_token=" +
- getInitParam("csrf_token"));
+ if (!activeFeedIsCat() && parseInt(getActiveFeedId()) > 0) {
+ window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + getActiveFeedId() +
+ "&csrf_token=" + getInitParam("csrf_token"));
+ } else {
+ alert("You can't debug this kind of feed.");
+ }
};
+
+ hotkey_actions["feed_debug_viewfeed"] = function() {
+ viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
+ };
+
hotkey_actions["feed_edit"] = function() {
if (activeFeedIsCat())
alert(__("You can't edit this kind of feed."));
}
};
hotkey_actions["goto_all"] = function() {
- viewfeed(-4);
+ viewfeed({feed: -4});
};
hotkey_actions["goto_fresh"] = function() {
- viewfeed(-3);
+ viewfeed({feed: -3});
};
hotkey_actions["goto_marked"] = function() {
- viewfeed(-1);
+ viewfeed({feed: -1});
};
hotkey_actions["goto_published"] = function() {
- viewfeed(-2);
+ viewfeed({feed: -2});
};
hotkey_actions["goto_tagcloud"] = function() {
- displayDlg("printTagCloud");
+ displayDlg(__("Tag cloud"), "printTagCloud");
};
hotkey_actions["goto_prefs"] = function() {
gotoPreferences();
hotkey_actions["select_article_cursor"] = function() {
var id = getArticleUnderPointer();
if (id) {
- var cb = dijit.byId("RCHK-" + id);
- if (cb) {
- cb.attr("checked", !cb.attr("checked"));
- toggleSelectRowById(cb, "RROW-" + id);
- return false;
+ var row = $("RROW-" + id);
+
+ if (row) {
+ var cb = dijit.getEnclosingWidget(
+ row.getElementsByClassName("rchk")[0]);
+
+ if (cb) {
+ cb.attr("checked", !cb.attr("checked"));
+ toggleSelectRowById(cb, "RROW-" + id);
+ return false;
+ }
}
}
};
if (!isCdmMode()) {
_widescreen_mode = !_widescreen_mode;
+ // reset stored sizes because geometry changed
+ setCookie("ttrss_ci_width", 0);
+ setCookie("ttrss_ci_height", 0);
+
switchPanelMode(_widescreen_mode);
+ } else {
+ alert(__("Widescreen is not available in combined mode."));
}
};
hotkey_actions["help_dialog"] = function() {
updateFeedList();
closeArticlePanel();
- _widescreen_mode = getInitParam("widescreen");
-
- if (_widescreen_mode) {
- switchPanelMode(_widescreen_mode);
+ if (parseInt(getCookie("ttrss_fh_width")) > 0) {
+ dijit.byId("feeds-holder").domNode.setStyle(
+ {width: getCookie("ttrss_fh_width") + "px" });
}
+ dijit.byId("main").resize();
+
+ var tmph = dojo.connect(dijit.byId('feeds-holder'), 'resize',
+ function (args) {
+ if (args && args.w >= 0) {
+ setCookie("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
+ }
+ });
+
+ var tmph = dojo.connect(dijit.byId('content-insert'), 'resize',
+ function (args) {
+ if (args && args.w >= 0 && args.h >= 0) {
+ setCookie("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
+ setCookie("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
+ }
+ });
+
});
delCookie("ttrss_test");
setActiveFeedId(hash_feed_id, hash_feed_is_cat);
}
- loading_set_progress(30);
+ loading_set_progress(50);
// can't use cache_clear() here because viewfeed might not have initialized yet
if ('sessionStorage' in window && window['sessionStorage'] !== null)
hotkeys[1] = tmp;
setInitParam("hotkeys", hotkeys);
+ _widescreen_mode = getInitParam("widescreen");
+ switchPanelMode(_widescreen_mode);
+
console.log("second stage ok");
if (getInitParam("simple_update")) {
gotoLogout();
break;
case "qmcTagCloud":
- displayDlg("printTagCloud");
- break;
- case "qmcTagSelect":
- displayDlg("printTagSelect");
+ displayDlg(__("Tag cloud"), "printTagCloud");
break;
case "qmcSearch":
search();
if (!isCdmMode()) {
_widescreen_mode = !_widescreen_mode;
+ // reset stored sizes because geometry changed
+ setCookie("ttrss_ci_width", 0);
+ setCookie("ttrss_ci_height", 0);
+
switchPanelMode(_widescreen_mode);
+ } else {
+ alert(__("Widescreen is not available in combined mode."));
}
break;
case "qmcHKhelp":
// console.log("RI: " + k + " => " + v);
- if (k == "new_version_available") {
- if (v == "1") {
- Element.show(dijit.byId("newVersionIcon").domNode);
- } else {
- Element.hide(dijit.byId("newVersionIcon").domNode);
- }
- return;
- }
-
if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) {
if (parseInt(getInitParam("dep_ts")) < parseInt(v) && getInitParam("reload_on_ts_change")) {
window.location.reload();
}
if (k == "daemon_is_running" && v != 1) {
- notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true);
+ notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
return;
}
+ if (k == "update_result") {
+ var updatesIcon = dijit.byId("updatesIcon").domNode;
+
+ if (v) {
+ Element.show(updatesIcon);
+ } else {
+ Element.hide(updatesIcon);
+ }
+ }
+
if (k == "daemon_stamp_ok" && v != 1) {
- notify_error("<span onclick=\"javascript:explainError(3)\">Update daemon is not updating feeds.</span>", true);
+ notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
return;
}
init_params[k] = v;
notify('');
}
+
+ PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data);
}
function collapse_feedlist() {
if (!Element.visible('feeds-holder')) {
Element.show('feeds-holder');
- Element.show('feeds-holder_splitter');
$("collapse_feeds_btn").innerHTML = "<<";
} else {
Element.hide('feeds-holder');
- Element.hide('feeds-holder_splitter');
$("collapse_feeds_btn").innerHTML = ">>";
}
dijit.byId("main").resize();
- query = "?op=rpc&method=setpref&key=_COLLAPSED_FEEDLIST&value=true";
- new Ajax.Request("backend.php", { parameters: query });
-
} catch (e) {
exception_error("collapse_feedlist", e);
}
return viewCurrentFeed('');
}
-function viewLimitChanged() {
- return viewCurrentFeed('');
-}
-
function rescoreCurrentFeed() {
var actid = getActiveFeedId();
var keycode = false;
var shift_key = false;
+ var ctrl_key = false;
+ var alt_key = false;
+ var meta_key = false;
var cmdline = $('cmdline');
shift_key = e.shiftKey;
ctrl_key = e.ctrlKey;
+ alt_key = e.altKey;
+ meta_key = e.metaKey;
if (window.event) {
keycode = window.event.keyCode;
// ensure ^*char notation
if (shift_key) hotkey = "*" + hotkey;
if (ctrl_key) hotkey = "^" + hotkey;
+ if (alt_key) hotkey = "+" + hotkey;
+ if (meta_key) hotkey = "%" + hotkey;
hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
hotkey_prefix = false;
}
}
-function newVersionDlg() {
- try {
- var query = "backend.php?op=dlg&method=newVersion";
-
- if (dijit.byId("newVersionDlg"))
- dijit.byId("newVersionDlg").destroyRecursive();
-
- dialog = new dijit.Dialog({
- id: "newVersionDlg",
- title: __("New version available!"),
- style: "width: 600px",
- href: query,
- });
-
- dialog.show();
-
- } catch (e) {
- exception_error("newVersionDlg", e);
- }
-}
-
function handle_rpc_json(transport, scheduled_call) {
try {
var reply = JSON.parse(transport.responseText);
+ var netalert_dijit = dijit.byId("net-alert");
+ var netalert = false;
+
+ if (netalert_dijit)
+ netalert = netalert_dijit.domNode;
+
if (reply) {
var error = reply['error'];
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);
- Element.hide(dijit.byId("net-alert").domNode);
+ if (netalert) Element.hide(netalert);
} else {
- //notify_error("Error communicating with server.");
- Element.show(dijit.byId("net-alert").domNode);
+ if (netalert)
+ Element.show(netalert);
+ else
+ notify_error("Communication problem with server.");
}
} catch (e) {
- Element.show(dijit.byId("net-alert").domNode);
- //notify_error("Error communicating with server.");
+ if (netalert)
+ Element.show(netalert);
+ else
+ notify_error("Communication problem with server.");
+
console.log(e);
//exception_error("handle_rpc_json", e, transport);
}
dijit.byId("content-insert").domNode.setStyle({width: '50%',
height: 'auto',
- borderLeftWidth: '1px',
- borderLeftColor: '#c0c0c0',
borderTopWidth: '0px' });
- $("headlines-toolbar").setStyle({ borderBottomWidth: '0px' });
+ if (parseInt(getCookie("ttrss_ci_width")) > 0) {
+ dijit.byId("content-insert").domNode.setStyle(
+ {width: getCookie("ttrss_ci_width") + "px" });
+ }
+
+ $("headlines-frame").setStyle({ borderBottomWidth: '0px' });
+ $("headlines-frame").addClassName("wide");
} else {
dijit.byId("content-insert").domNode.setStyle({width: 'auto',
height: '50%',
- borderLeftWidth: '0px',
- borderTopWidth: '1px'});
+ borderTopWidth: '0px'});
+
+ if (parseInt(getCookie("ttrss_ci_height")) > 0) {
+ dijit.byId("content-insert").domNode.setStyle(
+ {height: getCookie("ttrss_ci_height") + "px" });
+ }
+
+ $("headlines-frame").setStyle({ borderBottomWidth: '1px' });
+ $("headlines-frame").removeClassName("wide");
- $("headlines-toolbar").setStyle({ borderBottomWidth: '1px' });
}
closeArticlePanel();
kv = window.location.hash.substring(1).toQueryParams();
return kv[key];
} catch (e) {
- exception_error("hash_set", e);
+ exception_error("hash_get", e);
}
}
function hash_set(key, value) {
git.wh0rd.org / tt-rss.git / blobdiff