var total_unread = 0;
-var display_tags = false;
var global_unread = -1;
var firsttime_update = true;
var _active_feed_id = 0;
var init_params = {};
var _force_scheduled_update = false;
var last_scheduled_update = false;
-var treeModel;
var _rpc_seq = 0;
}
-function isFeedlistSortable() {
- return feedlist_sortable_enabled;
-}
-
-function tagsAreDisplayed() {
- return display_tags;
-}
-
-function toggleTags(show_all) {
-
- try {
-
- console.log("toggleTags: " + show_all + "; " + display_tags);
-
- var p = $("dispSwitchPrompt");
-
- if (!show_all && !display_tags) {
- displayDlg("printTagCloud");
- } else if (show_all) {
- closeInfoBox();
- display_tags = true;
- p.innerHTML = __("display feeds");
- notify_progress("Loading, please wait...", true);
- updateFeedList();
- } else if (display_tags) {
- display_tags = false;
- p.innerHTML = __("tag cloud");
- notify_progress("Loading, please wait...", true);
- updateFeedList();
- }
-
- } catch (e) {
- exception_error("toggleTags", e);
- }
-}
-
function dlg_frefresh_callback(transport, deleted_feed) {
if (getActiveFeedId() == deleted_feed) {
setTimeout("viewfeed(-5)", 100);
function updateFeedList() {
try {
- console.warn("updateFeedList: function not implemented");
-
-/* var query_str = "backend.php?op=feeds";
-
- if (display_tags) {
- query_str = query_str + "&tags=1";
- }
-
- if (getActiveFeedId() && !activeFeedIsCat()) {
- query_str = query_str + "&actid=" + getActiveFeedId();
+
+// $("feeds-holder").innerHTML = "<div id=\"feedlistLoading\">" +
+// __("Loading, please wait...") + "</div>";
+
+ Element.show("feedlistLoading");
+
+ if (dijit.byId("feedTree")) {
+ dijit.byId("feedTree").destroyRecursive();
}
+
+ var store = new dojo.data.ItemFileWriteStore({
+ url: "backend.php?op=feeds"});
+
+ var treeModel = new fox.FeedStoreModel({
+ store: store,
+ query: {
+ "type": "feed"
+ },
+ rootId: "root",
+ rootLabel: "Feeds",
+ childrenAttrs: ["items"]
+ });
+
+ var tree = new fox.FeedTree({
+ model: treeModel,
+ onOpen: function (item, node) {
+ var id = String(item.id);
+ var cat_id = id.substr(id.indexOf(":")+1);
+
+ new Ajax.Request("backend.php",
+ { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
+ param_escape(cat_id) + "&mode=0" } );
+ },
+ onClose: function (item, node) {
+ var id = String(item.id);
+ var cat_id = id.substr(id.indexOf(":")+1);
+
+ new Ajax.Request("backend.php",
+ { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
+ param_escape(cat_id) + "&mode=1" } );
+
+ },
+ onClick: function (item, node) {
+ var id = String(item.id);
+ var is_cat = id.match("^CAT:");
+ var feed = id.substr(id.indexOf(":")+1);
+ viewfeed(feed, '', is_cat);
+ return false;
+ },
+ openOnClick: false,
+ showRoot: false,
+ id: "feedTree",
+ }, "feedTree");
+
+/* var menu = new dijit.Menu({id: 'feedMenu'});
- new Ajax.Request("backend.php", {
- parameters: query_str,
- onComplete: function(transport) {
- render_feedlist(transport.responseText);
- } }); */
+ menu.addChild(new dijit.MenuItem({
+ label: "Simple menu item"
+ }));
+
+// menu.bindDomNode(tree.domNode); */
+
+ var tmph = dojo.connect(dijit.byId('feedMenu'), '_openMyself', function (event) {
+ console.log(dijit.getEnclosingWidget(event.target));
+ dojo.disconnect(tmph);
+ });
+
+ $("feeds-holder").appendChild(tree.domNode);
+
+ var tmph = dojo.connect(tree, 'onLoad', function() {
+ dojo.disconnect(tmph);
+ Element.hide("feedlistLoading");
+
+ tree.collapseHiddenCats();
+
+ feedlist_init();
+
+// var node = dijit.byId("feedTree")._itemNodesMap['FEED:-2'][0].domNode
+// menu.bindDomNode(node);
+
+ loading_set_progress(25);
+ });
+
+ tree.startup();
} catch (e) {
exception_error("updateFeedList", e);
firsttime_update = false;
omode = "T";
} else {
- if (display_tags) {
- omode = "tl";
- } else {
- omode = "flc";
- }
+ omode = "flc";
}
query_str = query_str + "&omode=" + omode;
function init() {
try {
- Form.disable("main_toolbar_form");
+ //Form.disable("main_toolbar_form");
dojo.require("dijit.layout.BorderContainer");
+ dojo.require("dijit.layout.TabContainer");
dojo.require("dijit.layout.ContentPane");
dojo.require("dijit.Dialog");
dojo.require("dijit.form.Button");
+ dojo.require("dijit.Menu");
dojo.require("dojo.data.ItemFileWriteStore");
dojo.require("dijit.Tree");
dojo.require("dijit.form.Select");
+ dojo.require("dijit.form.TextBox");
+ dojo.require("dijit.form.ValidationTextBox");
+ dojo.require("dijit.form.FilteringSelect");
+ dojo.require("dijit.form.CheckBox");
+ dojo.require("dijit.form.SimpleTextarea");
+ dojo.require("dijit.Toolbar");
+ dojo.require("dijit.ProgressBar");
+ dojo.require("dijit.Menu");
dojo.require("dojo.parser");
+ dojo.registerModulePath("fox", "../..");
+
+ dojo.require("fox.FeedTree");
+
+ if (typeof themeBeforeLayout == 'function') {
+ themeBeforeLayout();
+ }
+
dojo.addOnLoad(function() {
+ updateFeedList();
+ closeArticlePanel();
- var store = new dojo.data.ItemFileWriteStore({
- url: "backend.php?op=feeds"});
-
- treeModel = new dijit.tree.ForestStoreModel({
- store: store,
- query: {
- "type": "feed"
- },
- rootId: "root",
- rootLabel: "Feeds",
- childrenAttrs: ["items"]
- });
-
- var tree = new dijit.Tree({
- model: treeModel,
- _createTreeNode: function(args) {
- var tnode = new dijit._TreeNode(args);
- tnode.labelNode.innerHTML = args.label;
- return tnode;
- },
- getLabelClass: function (item, opened) {
- return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
- },
- getRowClass: function (item, opened) {
- return (!item.error || item.error == '') ? "dijitTreeRow" :
- "dijitTreeRow Error";
- },
- getLabel: function(item) {
- if (item.unread > 0) {
- return item.name + " (" + item.unread + ")";
- } else {
- return item.name;
- }
- },
- onOpen: function (item, node) {
- var id = String(item.id);
- var cat_id = id.substr(id.indexOf(":")+1);
-
- new Ajax.Request("backend.php",
- { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
- param_escape(cat_id) + "&mode=1" } );
- },
- onClose: function (item, node) {
- var id = String(item.id);
- var cat_id = id.substr(id.indexOf(":")+1);
-
- new Ajax.Request("backend.php",
- { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
- param_escape(cat_id) + "&mode=0" } );
-
- },
- onClick: function (item, node) {
- var id = String(item.id);
- var is_cat = id.match("^CAT:");
- var feed = id.substr(id.indexOf(":")+1);
- viewfeed(feed, '', is_cat);
- },
- showRoot: false,
- }, "feedTree");
+ if (typeof themeAfterLayout == 'function') {
+ themeAfterLayout();
+ }
});
if (!genericSanityCheck())
return;
- var params = "&ua=" + param_escape(navigator.userAgent);
-
- loading_set_progress(30);
+ loading_set_progress(20);
new Ajax.Request("backend.php", {
- parameters: "backend.php?op=rpc&subop=sanityCheck" + params,
+ parameters: {op: "rpc", subop: "sanityCheck"},
onComplete: function(transport) {
backend_sanity_check_callback(transport);
} });
var toolbar = document.forms["main_toolbar_form"];
- dropboxSelect(toolbar.view_mode, getInitParam("default_view_mode"));
- dropboxSelect(toolbar.order_by, getInitParam("default_view_order_by"));
+ dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
+ getInitParam("default_view_mode"));
+
+ dijit.getEnclosingWidget(toolbar.order_by).attr('value',
+ getInitParam("default_view_order_by"));
feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
- loading_set_progress(60);
+ loading_set_progress(30);
if (has_local_storage())
localStorage.clear();
console.log("second stage ok");
- feedlist_init();
-
} catch (e) {
exception_error("init_second_stage", e);
}
}
-function quickMenuChange() {
- var chooser = $("quickMenuChooser");
- var opid = chooser[chooser.selectedIndex].value;
-
- chooser.selectedIndex = 0;
- quickMenuGo(opid);
+function quickMenuChange(elem) {
+ quickMenuGo(elem.value);
+ elem.attr('value', 'qmcDefault');
}
function quickMenuGo(opid) {
gotoPreferences();
}
+ if (opid == "qmcTagCloud") {
+ displayDlg("printTagCloud");
+ }
+
if (opid == "qmcSearch") {
displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(),
function() {
}
if (opid == "qmcEditFeed") {
- editFeedDlg(getActiveFeedId());
+ if (activeFeedIsCat())
+ alert(__("You can't edit this kind of feed."));
+ else
+ editFeed(getActiveFeedId());
+ return;
}
if (opid == "qmcRemoveFeed") {
}
if (opid == "qmcAddFilter") {
- displayDlg('quickAddFilter', '',
- function () {document.forms['filter_add_form'].reg_exp.focus();});
+ quickAddFilter();
+ return;
}
if (opid == "qmcAddLabel") {
addLabel();
+ return;
}
if (opid == "qmcRescoreFeed") {
rescoreCurrentFeed();
+ return;
}
if (opid == "qmcHKhelp") {
Effect.Appear("hotkey_help_overlay", {duration : 0.3});
}
- if (opid == "qmcResetUI") {
- alert("Function not implemented");
- }
-
- if (opid == "qmcToggleReorder") {
- feedlist_sortable_enabled = !feedlist_sortable_enabled;
-
- if (feedlist_sortable_enabled) {
- notify_info("Category reordering enabled");
- toggle_sortable_feedlist(true);
- } else {
- notify_info("Category reordering disabled");
- toggle_sortable_feedlist(false);
- }
- }
-
- if (opid == "qmcResetCats") {
-
- if (confirm(__("Reset category order?"))) {
-
- var query = "?op=feeds&subop=catsortreset";
-
- notify_progress("Loading, please wait...", true);
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- window.setTimeout('updateFeedList(false, false)', 50);
- } });
- }
- }
-
} catch (e) {
exception_error("quickMenuGo", e);
}
var query = "?op=rpc&subop=setpref&key=HIDE_READ_FEEDS&value=" +
param_escape(hide);
+ setInitParam("hide_read_feeds", hide);
+
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
- setInitParam("hide_read_feeds", hide);
} });
} catch (e) {
}
}
-function editFeedDlg(feed) {
+function collapse_feedlist() {
try {
- if (!feed) {
- alert(__("Please select some feed first."));
- return;
- }
-
- if ((feed <= 0) || activeFeedIsCat() || tagsAreDisplayed()) {
- alert(__("You can't edit this kind of feed."));
- return;
- }
-
- var query = "";
-
- if (feed > 0) {
- query = "?op=pref-feeds&subop=editfeed&id=" + param_escape(feed);
+ if (!Element.visible('feeds-holder')) {
+ Element.show('feeds-holder');
+ $("collapse_feeds_btn").innerHTML = "<<";
} else {
- query = "?op=pref-labels&subop=edit&id=" + param_escape(-feed-11);
+ Element.hide('feeds-holder');
+ $("collapse_feeds_btn").innerHTML = ">>";
}
- disableHotkeys();
-
- notify_progress("Loading, please wait...", true);
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- infobox_callback2(transport);
- document.forms["edit_feed_form"].title.focus();
- } });
-
- } catch (e) {
- exception_error("editFeedDlg", e);
- }
-}
-
-/* this functions duplicate those of prefs.js feed editor, with
- some differences because there is no feedlist */
-
-function feedEditCancel() {
- closeInfoBox();
- return false;
-}
-
-function feedEditSave() {
-
- try {
-
- // FIXME: add parameter validation
-
- var query = Form.serialize("edit_feed_form");
-
- notify_progress("Saving feed...");
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- dlg_frefresh_callback(transport);
- } });
-
- cache_flush();
- closeInfoBox();
-
- return false;
-
- } catch (e) {
- exception_error("feedEditSave (main)", e);
- }
-}
-
-function collapse_feedlist() {
- try {
- console.warn("collapse_feedlist: function not implemented");
+ dijit.byId("main").resize();
query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=true";
new Ajax.Request("backend.php", { parameters: query });
var actid = getActiveFeedId();
- if (activeFeedIsCat() || actid < 0 || tagsAreDisplayed()) {
+ if (activeFeedIsCat() || actid < 0) {
alert(__("You can't rescore this kind of feed."));
return;
}
try {
+ var widget = dijit.getEnclosingWidget(e.target);
+ if (widget && Element.visible(widget.domNode)) return;
+
var keycode;
var shift_key = false;
closeInfoBox();
}
- if (dialogs.length > 0 || !hotkeys_enabled) {
+ var dialog = dijit.byId("infoBox");
+ var dialog_visible = false;
+
+ if (dialog)
+ dialog_visible = Element.visible(dialog.domNode);
+
+ if (dialog_visible || !hotkeys_enabled) {
console.log("hotkeys disabled");
return;
}
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 false;
}
-/* if (keycode == 82 && shift_key) { // R
- scheduleFeedUpdate(true);
- return;
- } */
-
if (keycode == 74) { // j
- var feed = getActiveFeedId();
- var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'prev');
-// alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
- if (new_feed) {
- var is_cat = new_feed.match("CAT:");
- if (is_cat) {
- new_feed = new_feed.replace("CAT:", "");
- viewCategory(new_feed);
- } else {
- viewfeed(new_feed, '', false);
- }
- }
+ // TODO: move to previous feed
return;
}
if (keycode == 75) { // k
- var feed = getActiveFeedId();
- var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'next');
-// alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
- if (new_feed) {
- var is_cat = new_feed.match("CAT:");
- if (is_cat == "CAT:") {
- new_feed = new_feed.replace("CAT:", "");
- viewCategory(new_feed);
- } else {
- viewfeed(new_feed, '', false);
- }
- }
+ // TODO: move to next feed
return;
}
return false;
}
-/* if (keycode == 85 && shift_key) { // U
- scheduleFeedUpdate(true);
- return false;
- } */
-
if (keycode == 85) { // u
if (getActiveFeedId()) {
viewfeed(getActiveFeedId(), "ForceUpdate");
}
if (keycode == 69) { // e
- editFeedDlg(getActiveFeedId());
+
+ if (activeFeedIsCat())
+ alert(__("You can't edit this kind of feed."));
+ else
+ editFeed(getActiveFeedId());
+ return;
+
return false;
}
hotkey_prefix = false;
if (keycode == 70) { // f
- displayDlg('quickAddFilter', '',
- function () {document.forms['filter_add_form'].reg_exp.focus();});
+ quickAddFilter();
return false;
}
}
if (keycode == 77) { // m
- feedlist_sortable_enabled = !feedlist_sortable_enabled;
- if (feedlist_sortable_enabled) {
- notify_info("Category reordering enabled");
- toggle_sortable_feedlist(true);
- } else {
- notify_info("Category reordering disabled");
- toggle_sortable_feedlist(false);
- }
+ // TODO: sortable feedlist
+ return;
}
if (keycode == 78) { // n
if (runtime_info)
parse_runtime_info(runtime_info);
- if (feedsSortByUnread())
- resort_feedlist();
-
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
} else {
return true;
}
-function scheduleFeedUpdate() {
+function scheduleFeedUpdate(id, is_cat) {
try {
+ if (!id) {
+ id = getActiveFeedId();
+ is_cat = activeFeedIsCat();
+ }
- if (!getActiveFeedId()) {
+ if (!id) {
alert(__("Please select some feed first."));
return;
}
var query = "?op=rpc&subop=scheduleFeedUpdate&id=" +
- param_escape(getActiveFeedId()) +
- "&is_cat=" + param_escape(activeFeedIsCat());
+ param_escape(id) +
+ "&is_cat=" + param_escape(is_cat);
console.log(query);
git.wh0rd.org / tt-rss.git / blobdiff