var params = "&ua=" + param_escape(navigator.userAgent);
+ loading_set_progress(30);
+
new Ajax.Request("backend.php?op=rpc&subop=sanityCheck" + params, {
onComplete: function(transport) {
backend_sanity_check_callback(transport);
setTimeout('updateFeedList(false, false)', 50);
debug("second stage ok");
-
+
+ loading_set_progress(60);
+
} catch (e) {
exception_error("init_second_stage", e);
}
// queue: { position: 'end', scope: 'FLFADEQ', limit: 1 }});
}
} catch (e) {
- exception_error(e, "toggle_feedlist");
+ exception_error("toggle_feedlist", e);
}
} */
setCookie("ttrss_vf_fclps", "1");
}
} catch (e) {
- exception_error(e, "toggle_feedlist");
+ exception_error("toggle_feedlist", e);
}
}
}
} catch (e) {
- exception_error(e, "adjustArticleScore");
+ exception_error("adjustArticleScore", e);
}
}
keycode = e.which;
}
+ var keychar = String.fromCharCode(keycode);
+
if (keycode == 27) { // escape
if (Element.visible("hotkey_help_overlay")) {
Element.hide("hotkey_help_overlay");
if ((keycode == 70 || keycode == 67 || keycode == 71) && !hotkey_prefix) {
hotkey_prefix = keycode;
- debug("KP: PREFIX=" + keycode);
+ debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
return;
}
return;
}
- if (keycode == 191 && shift_key) { // ?
+ if ((keycode == 191 || keychar == '?') && shift_key) { // ?
if (!Element.visible("hotkey_help_overlay")) {
//Element.show("hotkey_help_overlay");
Effect.Appear("hotkey_help_overlay", {duration : 0.3});
} else {
Element.hide("hotkey_help_overlay");
}
- return;
+ return false;
}
- if (keycode == 191) { // /
- return displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+ if (keycode == 191 || keychar == '/') { // /
+ displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+ return false;
+ }
+
+ if (keycode == 82 && shift_key) { // R
+ scheduleFeedUpdate(true);
+ return false;
}
if (keycode == 82) { // r
- return scheduleFeedUpdate(true);
+ if (getActiveFeedId()) {
+ viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+ return;
+ }
}
if (keycode == 74) { // j
var feed = getActiveFeedId();
var new_feed = getRelativeFeedId(feedlist, feed, 'prev');
if (new_feed) viewfeed(new_feed, '');
- return;
+ return false;
}
if (keycode == 75) { // k
var feed = getActiveFeedId();
var new_feed = getRelativeFeedId(feedlist, feed, 'next');
if (new_feed) viewfeed(new_feed, '');
- return;
+ return false;
+ }
+
+ if (shift_key && (keycode == 78 || keycode == 40)) { // shift - n, down
+ catchupRelativeToArticle(1);
+ return false;
+ }
+
+ if (shift_key && (keycode == 80 || keycode == 38)) { // shift - p, up
+ catchupRelativeToArticle(0);
+ return false;
}
if (keycode == 78 || keycode == 40) { // n, down
if (typeof moveToPost != 'undefined') {
- return moveToPost('next');
+ moveToPost('next');
+ return false;
}
}
if (keycode == 80 || keycode == 38) { // p, up
if (typeof moveToPost != 'undefined') {
- return moveToPost('prev');
+ moveToPost('prev');
+ return false;
}
}
if (id) {
togglePub(id);
}
- return;
+ return false;
}
if (keycode == 83) { // s
if (id) {
toggleMark(id);
}
- return;
+ return false;
}
if (id) {
toggleUnread(id);
}
- return;
+ return false;
}
- if (keycode == 84) { // t
+ if (keycode == 84 && shift_key) { // T
var id = getActiveArticleId();
if (id) {
editArticleTags(id, getActiveFeedId(), isCdmMode());
+ return false;
}
}
-/* if (keycode == 84) { // t
- var id = getActiveArticleId();
+ if (keycode == 9) { // tab
+ var id = getArticleUnderPointer();
if (id) {
var cb = document.getElementById("RCHK-" + id);
if (cb) {
cb.checked = !cb.checked;
toggleSelectRowById(cb, "RROW-" + id);
+ return false;
}
}
- } */
+ }
if (keycode == 79) { // o
if (getActiveArticleId()) {
openArticleInNewWindow(getActiveArticleId());
+ return false;
}
}
+ if (keycode == 81 && shift_key) { // Q
+ if (typeof catchupAllFeeds != 'undefined') {
+ catchupAllFeeds();
+ return;
+ }
+ }
+
+ if (keycode == 81) { // q
+ if (getActiveFeedId()) {
+ catchupCurrentFeed();
+ return;
+ }
+ }
+
+ if (keycode == 220 && shift_key) { // shift + |
+ if (document.getElementById("subtoolbar_search")) {
+ if (Element.visible("subtoolbar_search")) {
+ Element.hide("subtoolbar_search");
+ Element.show("subtoolbar_ftitle");
+ setTimeout("Element.focus('subtoolbar_search_box')", 100);
+ } else {
+ Element.show("subtoolbar_search");
+ Element.hide("subtoolbar_ftitle");
+ }
+ }
+ }
}
/* Prefix f */
hotkey_prefix = false;
if (keycode == 65) { // a
- return toggleDispRead();
+ toggleDispRead();
+ return false;
}
if (keycode == 85 && shift_key) { // U
- return scheduleFeedUpdate(true);
+ scheduleFeedUpdate(true);
+ return false;
}
if (keycode == 85) { // u
if (getActiveFeedId()) {
- return viewfeed(getActiveFeedId(), "ForceUpdate");
+ viewfeed(getActiveFeedId(), "ForceUpdate");
+ return false;
}
}
if (keycode == 69) { // e
- return editFeedDlg(getActiveFeedId());
+ editFeedDlg(getActiveFeedId());
+ return false;
}
if (keycode == 83) { // s
- return displayDlg("quickAddFeed");
+ displayDlg("quickAddFeed");
+ return false;
}
if (keycode == 67 && shift_key) { // C
if (typeof catchupAllFeeds != 'undefined') {
- return catchupAllFeeds();
+ catchupAllFeeds();
+ return false;
}
}
if (keycode == 67) { // c
if (getActiveFeedId()) {
- return catchupCurrentFeed();
+ catchupCurrentFeed();
+ return false;
}
}
hotkey_prefix = false;
if (keycode == 70) { // f
- return displayDlg("quickAddFilter", getActiveFeedId());
+ displayDlg("quickAddFilter", getActiveFeedId());
+ return false;
}
if (keycode == 83) { // s
if (typeof collapse_feedlist != 'undefined') {
- return collapse_feedlist();
+ collapse_feedlist();
+ return false;
}
}
hotkey_prefix = false;
if (keycode == 83) { // s
- return viewfeed(-1);
+ viewfeed(-1);
+ return false;
}
if (keycode == 80 && shift_key) { // P
- return gotoPreferences();
+ gotoPreferences();
+ return false;
}
if (keycode == 80) { // p
- return viewfeed(-2);
+ viewfeed(-2);
+ return false;
}
if (keycode == 70) { // f
- return viewfeed(-3);
+ viewfeed(-3);
+ return false;
}
if (keycode == 84 && shift_key) { // T
toggleTags();
+ return false;
}
}
} */
if (hotkey_prefix) {
- debug("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode);
-
+ debug("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
} else {
- debug("KP: CODE=" + keycode);
+ debug("KP: CODE=" + keycode + " CHAR=" + keychar);
}
}
}
-