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,
$("feeds-holder").appendChild(tree.domNode);
var tmph = dojo.connect(tree, 'onLoad', function() {
- dojo.disconnect(tmph);
+ dojo.disconnect(tmph);
Element.hide("feedlistLoading");
feedlist_init();
}
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
}
var rv = dijit.byId("feedTree").getNextFeed(
getActiveFeedId(), activeFeedIsCat());
- if (rv) viewfeed(rv[0], '', rv[1], null, null, null, true);
+ 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], null, null, null, true);
+ if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
};
hotkey_actions["next_article"] = function() {
moveToPost('next');
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());
if (isCdmMode()) {
if (!getInitParam("cdm_expanded")) {
cdmCollapseArticle(false, getActiveArticleId());
- } else {
- dismissArticle(getActiveArticleId());
}
} else {
closeArticlePanel();
};
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["feed_reverse"] = function() {
reverseHeadlineOrder();
};
+ hotkey_actions["feed_toggle_vgroup"] = function() {
+ var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
+
+ new Ajax.Request("backend.php", {
+ parameters: query_str,
+ onComplete: function(transport) {
+ viewCurrentFeed();
+ } });
+
+ };
hotkey_actions["catchup_all"] = function() {
catchupAllFeeds();
};
}
};
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(__("Tag cloud"), "printTagCloud");
case "qmcTagCloud":
displayDlg(__("Tag cloud"), "printTagCloud");
break;
- case "qmcTagSelect":
- displayDlg(__("Select item(s) by tags"), "printTagSelect");
- break;
case "qmcSearch":
search();
break;
}
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 == "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;
}