summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/FeedTree.js1010
-rw-r--r--js/PrefFeedTree.js229
-rw-r--r--js/PrefFilterTree.js182
-rw-r--r--js/PrefLabelTree.js62
-rwxr-xr-xjs/prefs.js116
-rw-r--r--js/tt-rss.js699
6 files changed, 1165 insertions, 1133 deletions
diff --git a/js/FeedTree.js b/js/FeedTree.js
index c7c892b42..e4daec522 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -1,589 +1,591 @@
-dojo.provide("fox.FeedTree");
-dojo.provide("fox.FeedStoreModel");
-
-dojo.require("dijit.Tree");
-dojo.require("dijit.Menu");
-
-dojo.declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
- getItemsInCategory: function (id) {
- if (!this.store._itemsByIdentity) return undefined;
-
- cat = this.store._itemsByIdentity['CAT:' + id];
-
- if (cat && cat.items)
- return cat.items;
- else
- return undefined;
-
- },
- getItemById: function(id) {
- return this.store._itemsByIdentity[id];
- },
- getFeedValue: function(feed, is_cat, key) {
- if (!this.store._itemsByIdentity) return undefined;
-
- if (is_cat)
- treeItem = this.store._itemsByIdentity['CAT:' + feed];
- else
- treeItem = this.store._itemsByIdentity['FEED:' + feed];
-
- if (treeItem)
- return this.store.getValue(treeItem, key);
- },
- getFeedName: function(feed, is_cat) {
- return this.getFeedValue(feed, is_cat, 'name');
- },
- getFeedUnread: function(feed, is_cat) {
- var unread = parseInt(this.getFeedValue(feed, is_cat, 'unread'));
- return (isNaN(unread)) ? 0 : unread;
- },
- setFeedUnread: function(feed, is_cat, unread) {
- return this.setFeedValue(feed, is_cat, 'unread', parseInt(unread));
- },
- setFeedValue: function(feed, is_cat, key, value) {
- if (!value) value = '';
- if (!this.store._itemsByIdentity) return undefined;
-
- if (is_cat)
- treeItem = this.store._itemsByIdentity['CAT:' + feed];
- else
- treeItem = this.store._itemsByIdentity['FEED:' + feed];
-
- if (treeItem)
- return this.store.setValue(treeItem, key, value);
- },
- getNextUnreadFeed: function (feed, is_cat) {
- if (!this.store._itemsByIdentity)
- return null;
+require(["dojo/_base/declare", "dijit/tree/ForestStoreModel"], function (declare) {
+
+ return declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
+ getItemsInCategory: function (id) {
+ if (!this.store._itemsByIdentity) return undefined;
+
+ cat = this.store._itemsByIdentity['CAT:' + id];
+
+ if (cat && cat.items)
+ return cat.items;
+ else
+ return undefined;
+
+ },
+ getItemById: function (id) {
+ return this.store._itemsByIdentity[id];
+ },
+ getFeedValue: function (feed, is_cat, key) {
+ if (!this.store._itemsByIdentity) return undefined;
+
+ if (is_cat)
+ treeItem = this.store._itemsByIdentity['CAT:' + feed];
+ else
+ treeItem = this.store._itemsByIdentity['FEED:' + feed];
+
+ if (treeItem)
+ return this.store.getValue(treeItem, key);
+ },
+ getFeedName: function (feed, is_cat) {
+ return this.getFeedValue(feed, is_cat, 'name');
+ },
+ getFeedUnread: function (feed, is_cat) {
+ var unread = parseInt(this.getFeedValue(feed, is_cat, 'unread'));
+ return (isNaN(unread)) ? 0 : unread;
+ },
+ setFeedUnread: function (feed, is_cat, unread) {
+ return this.setFeedValue(feed, is_cat, 'unread', parseInt(unread));
+ },
+ setFeedValue: function (feed, is_cat, key, value) {
+ if (!value) value = '';
+ if (!this.store._itemsByIdentity) return undefined;
+
+ if (is_cat)
+ treeItem = this.store._itemsByIdentity['CAT:' + feed];
+ else
+ treeItem = this.store._itemsByIdentity['FEED:' + feed];
+
+ if (treeItem)
+ return this.store.setValue(treeItem, key, value);
+ },
+ getNextUnreadFeed: function (feed, is_cat) {
+ if (!this.store._itemsByIdentity)
+ return null;
- if (is_cat) {
- treeItem = this.store._itemsByIdentity['CAT:' + feed];
- } else {
- treeItem = this.store._itemsByIdentity['FEED:' + feed];
- }
+ if (is_cat) {
+ treeItem = this.store._itemsByIdentity['CAT:' + feed];
+ } else {
+ treeItem = this.store._itemsByIdentity['FEED:' + feed];
+ }
- items = this.store._arrayOfAllItems;
+ items = this.store._arrayOfAllItems;
- for (var i = 0; i < items.length; i++) {
- if (items[i] == treeItem) {
+ for (var i = 0; i < items.length; i++) {
+ if (items[i] == treeItem) {
- for (var j = i+1; j < items.length; j++) {
- var unread = this.store.getValue(items[j], 'unread');
- var id = this.store.getValue(items[j], 'id');
+ for (var j = i + 1; j < items.length; j++) {
+ var unread = this.store.getValue(items[j], 'unread');
+ var id = this.store.getValue(items[j], 'id');
- if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
- if( !is_cat || ! (this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed) ) return items[j];
+ if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
+ if (!is_cat || !(this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed)) return items[j];
+ }
}
- }
- for (var j = 0; j < i; j++) {
- var unread = this.store.getValue(items[j], 'unread');
- var id = this.store.getValue(items[j], 'id');
+ for (var j = 0; j < i; j++) {
+ var unread = this.store.getValue(items[j], 'unread');
+ var id = this.store.getValue(items[j], 'id');
- if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
- if( !is_cat || ! (this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed) ) return items[j];
+ if (unread > 0 && ((is_cat && id.match("CAT:")) || (!is_cat && id.match("FEED:")))) {
+ if (!is_cat || !(this.store.hasAttribute(items[j], 'parent_id') && this.store.getValue(items[j], 'parent_id') == feed)) return items[j];
+ }
}
}
}
- }
-
- return null;
- },
- hasCats: function() {
- if (this.store && this.store._itemsByIdentity)
- return this.store._itemsByIdentity['CAT:-1'] != undefined;
- else
- return false;
- },
+
+ return null;
+ },
+ hasCats: function () {
+ if (this.store && this.store._itemsByIdentity)
+ return this.store._itemsByIdentity['CAT:-1'] != undefined;
+ else
+ return false;
+ },
+
+ });
});
-dojo.declare("fox.FeedTree", dijit.Tree, {
- _onKeyPress: function(/* Event */ e) {
- return; // Stop dijit.Tree from interpreting keystrokes
- },
- _createTreeNode: function(args) {
- var tnode = new dijit._TreeNode(args);
+require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
- if (args.item.icon && args.item.icon[0])
- tnode.iconNode.src = args.item.icon[0];
+ return declare("fox.FeedTree", dijit.Tree, {
+ _onKeyPress: function(/* Event */ e) {
+ return; // Stop dijit.Tree from interpreting keystrokes
+ },
+ _createTreeNode: function(args) {
+ var tnode = new dijit._TreeNode(args);
- var id = args.item.id[0];
- var bare_id = parseInt(id.substr(id.indexOf(':')+1));
+ if (args.item.icon && args.item.icon[0])
+ tnode.iconNode.src = args.item.icon[0];
- if (bare_id < _label_base_index) {
- var span = dojo.doc.createElement('span');
- var fg_color = args.item.fg_color[0];
- var bg_color = args.item.bg_color[0];
+ var id = args.item.id[0];
+ var bare_id = parseInt(id.substr(id.indexOf(':')+1));
- span.innerHTML = "&alpha;";
- span.className = 'labelColorIndicator';
- span.setStyle({
- color: fg_color,
- backgroundColor: bg_color});
+ if (bare_id < _label_base_index) {
+ var span = dojo.doc.createElement('span');
+ var fg_color = args.item.fg_color[0];
+ var bg_color = args.item.bg_color[0];
- dojo.place(span, tnode.iconNode, 'replace');
- }
+ span.innerHTML = "&alpha;";
+ span.className = 'labelColorIndicator';
+ span.setStyle({
+ color: fg_color,
+ backgroundColor: bg_color});
- if (id.match("FEED:")) {
- var menu = new dijit.Menu();
- menu.row_id = bare_id;
+ dojo.place(span, tnode.iconNode, 'replace');
+ }
- menu.addChild(new dijit.MenuItem({
- label: __("Mark as read"),
- onClick: function() {
- catchupFeed(this.getParent().row_id);
- }}));
+ if (id.match("FEED:")) {
+ var menu = new dijit.Menu();
+ menu.row_id = bare_id;
- if (bare_id > 0) {
menu.addChild(new dijit.MenuItem({
- label: __("Edit feed"),
+ label: __("Mark as read"),
onClick: function() {
- editFeed(this.getParent().row_id, false);
+ catchupFeed(this.getParent().row_id);
}}));
- /* menu.addChild(new dijit.MenuItem({
- label: __("Update feed"),
+ if (bare_id > 0) {
+ menu.addChild(new dijit.MenuItem({
+ label: __("Edit feed"),
+ onClick: function() {
+ editFeed(this.getParent().row_id, false);
+ }}));
+
+ /* menu.addChild(new dijit.MenuItem({
+ label: __("Update feed"),
+ onClick: function() {
+ heduleFeedUpdate(this.getParent().row_id, false);
+ }})); */
+ }
+
+ menu.bindDomNode(tnode.domNode);
+ tnode._menu = menu;
+ }
+
+ if (id.match("CAT:") && bare_id >= 0) {
+ var menu = new dijit.Menu();
+ menu.row_id = bare_id;
+
+ menu.addChild(new dijit.MenuItem({
+ label: __("Mark as read"),
onClick: function() {
- heduleFeedUpdate(this.getParent().row_id, false);
- }})); */
+ catchupFeed(this.getParent().row_id, true);
+ }}));
+
+ menu.bindDomNode(tnode.domNode);
+ tnode._menu = menu;
}
- menu.bindDomNode(tnode.domNode);
- tnode._menu = menu;
- }
-
- if (id.match("CAT:") && bare_id >= 0) {
- var menu = new dijit.Menu();
- menu.row_id = bare_id;
-
- menu.addChild(new dijit.MenuItem({
- label: __("Mark as read"),
- onClick: function() {
- catchupFeed(this.getParent().row_id, true);
- }}));
-
- menu.bindDomNode(tnode.domNode);
- tnode._menu = menu;
- }
-
- 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;
- }
-
- if (id.match("CAT:") && bare_id == -1) {
- var menu = new dijit.Menu();
- menu.row_id = bare_id;
-
- menu.addChild(new dijit.MenuItem({
- label: __("Mark all feeds as read"),
- onClick: function() {
- catchupAllFeeds();
- }}));
-
- menu.bindDomNode(tnode.domNode);
- tnode._menu = menu;
- }
-
- ctr = dojo.doc.createElement('span');
- ctr.className = 'counterNode';
- ctr.innerHTML = args.item.unread > 0 ? args.item.unread : args.item.auxcounter;
-
- //args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
-
- args.item.unread > 0 || args.item.auxcounter > 0 ? Element.show(ctr) : Element.hide(ctr);
-
- args.item.unread == 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
-
- dojo.place(ctr, tnode.rowNode, 'first');
- tnode.counterNode = ctr;
-
- //tnode.labelNode.innerHTML = args.label;
- return tnode;
- },
- postCreate: function() {
- this.connect(this.model, "onChange", "updateCounter");
- this.connect(this, "_expandNode", function() {
- this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
- });
-
- this.inherited(arguments);
- },
- updateCounter: function (item) {
- var tree = this;
-
- //console.log("updateCounter: " + item.id[0] + " " + item.unread + " " + tree);
-
- var node = tree._itemNodesMap[item.id];
-
- if (node) {
- node = node[0];
-
- if (node.counterNode) {
- ctr = node.counterNode;
- ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
- item.unread > 0 || item.auxcounter > 0 ?
- Effect.Appear(ctr, {duration : 0.3,
- queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
- Element.hide(ctr);
+ 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;
+ }
- item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+ if (id.match("CAT:") && bare_id == -1) {
+ var menu = new dijit.Menu();
+ menu.row_id = bare_id;
+ menu.addChild(new dijit.MenuItem({
+ label: __("Mark all feeds as read"),
+ onClick: function() {
+ catchupAllFeeds();
+ }}));
+
+ menu.bindDomNode(tnode.domNode);
+ tnode._menu = menu;
}
- }
-
- },
- getTooltip: function (item) {
- if (item.updated)
- return item.updated;
- else
- return "";
- },
- getIconClass: function (item, opened) {
- return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
- },
- getLabelClass: function (item, opened) {
- return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
- },
- getRowClass: function (item, opened) {
- var rc = (!item.error || item.error == '') ? "dijitTreeRow" :
- "dijitTreeRow Error";
-
- if (item.unread > 0) rc += " Unread";
-
- return rc;
- },
- getLabel: function(item) {
- var name = String(item.name);
-
- /* Horrible */
- name = name.replace(/&quot;/g, "\"");
- name = name.replace(/&amp;/g, "&");
- name = name.replace(/&mdash;/g, "-");
- name = name.replace(/&lt;/g, "<");
- name = name.replace(/&gt;/g, ">");
-
- /* var label;
-
- if (item.unread > 0) {
- label = name + " (" + item.unread + ")";
- } else {
- label = name;
- } */
-
- return name;
- },
- expandParentNodes: function(feed, is_cat, list) {
- try {
- for (var i = 0; i < list.length; i++) {
- var id = String(list[i].id);
- var item = this._itemNodesMap[id];
-
- if (item) {
- item = item[0];
- this._expandNode(item);
+
+ ctr = dojo.doc.createElement('span');
+ ctr.className = 'counterNode';
+ ctr.innerHTML = args.item.unread > 0 ? args.item.unread : args.item.auxcounter;
+
+ //args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
+
+ args.item.unread > 0 || args.item.auxcounter > 0 ? Element.show(ctr) : Element.hide(ctr);
+
+ args.item.unread == 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+
+ dojo.place(ctr, tnode.rowNode, 'first');
+ tnode.counterNode = ctr;
+
+ //tnode.labelNode.innerHTML = args.label;
+ return tnode;
+ },
+ postCreate: function() {
+ this.connect(this.model, "onChange", "updateCounter");
+ this.connect(this, "_expandNode", function() {
+ this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
+ });
+
+ this.inherited(arguments);
+ },
+ updateCounter: function (item) {
+ var tree = this;
+
+ //console.log("updateCounter: " + item.id[0] + " " + item.unread + " " + tree);
+
+ var node = tree._itemNodesMap[item.id];
+
+ if (node) {
+ node = node[0];
+
+ if (node.counterNode) {
+ ctr = node.counterNode;
+ ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
+ item.unread > 0 || item.auxcounter > 0 ?
+ Effect.Appear(ctr, {duration : 0.3,
+ queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
+ Element.hide(ctr);
+
+ item.unread == 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
+
}
}
- } catch (e) {
- exception_error("expandParentNodes", e);
- }
- },
- findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
- // expands all parents of specified feed to properly mark it as active
- // my fav thing about frameworks is doing everything myself
- try {
- var test_id = is_cat ? 'CAT:' + feed : 'FEED:' + feed;
-
- if (!root) {
- if (!this.model || !this.model.store) return false;
-
- var items = this.model.store._arrayOfTopLevelItems;
-
- for (var i = 0; i < items.length; i++) {
- if (String(items[i].id) == test_id) {
- this.expandParentNodes(feed, is_cat, parents);
- } else {
- this.findNodeParentsAndExpandThem(feed, is_cat, items[i], []);
+
+ },
+ getTooltip: function (item) {
+ if (item.updated)
+ return item.updated;
+ else
+ return "";
+ },
+ getIconClass: function (item, opened) {
+ return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
+ },
+ getLabelClass: function (item, opened) {
+ return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
+ },
+ getRowClass: function (item, opened) {
+ var rc = (!item.error || item.error == '') ? "dijitTreeRow" :
+ "dijitTreeRow Error";
+
+ if (item.unread > 0) rc += " Unread";
+
+ return rc;
+ },
+ getLabel: function(item) {
+ var name = String(item.name);
+
+ /* Horrible */
+ name = name.replace(/&quot;/g, "\"");
+ name = name.replace(/&amp;/g, "&");
+ name = name.replace(/&mdash;/g, "-");
+ name = name.replace(/&lt;/g, "<");
+ name = name.replace(/&gt;/g, ">");
+
+ /* var label;
+
+ if (item.unread > 0) {
+ label = name + " (" + item.unread + ")";
+ } else {
+ label = name;
+ } */
+
+ return name;
+ },
+ expandParentNodes: function(feed, is_cat, list) {
+ try {
+ for (var i = 0; i < list.length; i++) {
+ var id = String(list[i].id);
+ var item = this._itemNodesMap[id];
+
+ if (item) {
+ item = item[0];
+ this._expandNode(item);
}
}
- } else {
- if (root.items) {
- parents.push(root);
+ } catch (e) {
+ exception_error("expandParentNodes", e);
+ }
+ },
+ findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
+ // expands all parents of specified feed to properly mark it as active
+ // my fav thing about frameworks is doing everything myself
+ try {
+ var test_id = is_cat ? 'CAT:' + feed : 'FEED:' + feed;
+
+ if (!root) {
+ if (!this.model || !this.model.store) return false;
- for (var i = 0; i < root.items.length; i++) {
- if (String(root.items[i].id) == test_id) {
+ var items = this.model.store._arrayOfTopLevelItems;
+
+ for (var i = 0; i < items.length; i++) {
+ if (String(items[i].id) == test_id) {
this.expandParentNodes(feed, is_cat, parents);
} else {
- this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents.slice(0));
+ this.findNodeParentsAndExpandThem(feed, is_cat, items[i], []);
}
}
} else {
- if (String(root.id) == test_id) {
- this.expandParentNodes(feed, is_cat, parents.slice(0));
+ if (root.items) {
+ parents.push(root);
+
+ for (var i = 0; i < root.items.length; i++) {
+ if (String(root.items[i].id) == test_id) {
+ this.expandParentNodes(feed, is_cat, parents);
+ } else {
+ this.findNodeParentsAndExpandThem(feed, is_cat, root.items[i], parents.slice(0));
+ }
+ }
+ } else {
+ if (String(root.id) == test_id) {
+ this.expandParentNodes(feed, is_cat, parents.slice(0));
+ }
}
}
+ } catch (e) {
+ exception_error("findNodeParentsAndExpandThem", e);
}
- } catch (e) {
- exception_error("findNodeParentsAndExpandThem", e);
- }
- },
- selectFeed: function(feed, is_cat) {
- this.findNodeParentsAndExpandThem(feed, is_cat, false, false);
-
- if (is_cat)
- treeNode = this._itemNodesMap['CAT:' + feed];
- else
- treeNode = this._itemNodesMap['FEED:' + feed];
-
- if (treeNode) {
- treeNode = treeNode[0];
- if (!is_cat) this._expandNode(treeNode);
- this.set("selectedNodes", [treeNode]);
- }
- },
- setFeedIcon: function(feed, is_cat, src) {
- if (is_cat)
- treeNode = this._itemNodesMap['CAT:' + feed];
- else
- treeNode = this._itemNodesMap['FEED:' + feed];
-
- if (treeNode) {
- treeNode = treeNode[0];
- treeNode.iconNode.src = src;
- return true;
- }
- return false;
- },
- setFeedExpandoIcon: function(feed, is_cat, src) {
- if (is_cat)
- treeNode = this._itemNodesMap['CAT:' + feed];
- else
- treeNode = this._itemNodesMap['FEED:' + feed];
-
- if (treeNode) {
- treeNode = treeNode[0];
- if (treeNode.loadingNode) {
- treeNode.loadingNode.src = src;
- return true;
- } else {
- treeNode.expandoNode.src = src;
- return true;
- }
- }
-
- return false;
- },
- hasCats: function() {
- return this.model.hasCats();
- },
- hideReadCat: function (cat, hide, show_special) {
- if (this.hasCats()) {
- var tree = this;
+ },
+ selectFeed: function(feed, is_cat) {
+ this.findNodeParentsAndExpandThem(feed, is_cat, false, false);
- if (cat && cat.items) {
- var cat_unread = tree.hideReadFeeds(cat.items, hide, show_special);
+ if (is_cat)
+ treeNode = this._itemNodesMap['CAT:' + feed];
+ else
+ treeNode = this._itemNodesMap['FEED:' + feed];
+
+ if (treeNode) {
+ treeNode = treeNode[0];
+ if (!is_cat) this._expandNode(treeNode);
+ this.set("selectedNodes", [treeNode]);
+ }
+ },
+ setFeedIcon: function(feed, is_cat, src) {
+ if (is_cat)
+ treeNode = this._itemNodesMap['CAT:' + feed];
+ else
+ treeNode = this._itemNodesMap['FEED:' + feed];
- var id = String(cat.id);
- var node = tree._itemNodesMap[id];
- var bare_id = parseInt(id.substr(id.indexOf(":")+1));
+ if (treeNode) {
+ treeNode = treeNode[0];
+ treeNode.iconNode.src = src;
+ return true;
+ }
+ return false;
+ },
+ setFeedExpandoIcon: function(feed, is_cat, src) {
+ if (is_cat)
+ treeNode = this._itemNodesMap['CAT:' + feed];
+ else
+ treeNode = this._itemNodesMap['FEED:' + feed];
- if (node) {
- var check_unread = tree.model.getFeedUnread(bare_id, true);
+ if (treeNode) {
+ treeNode = treeNode[0];
+ if (treeNode.loadingNode) {
+ treeNode.loadingNode.src = src;
+ return true;
+ } else {
+ treeNode.expandoNode.src = src;
+ return true;
+ }
+ }
- if (hide && cat_unread == 0 && check_unread == 0 && (id != "CAT:-1" || !show_special)) {
- Effect.Fade(node[0].rowNode, {duration : 0.3,
- queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
- } else {
- Element.show(node[0].rowNode);
- ++cat_unread;
+ return false;
+ },
+ hasCats: function() {
+ return this.model.hasCats();
+ },
+ hideReadCat: function (cat, hide, show_special) {
+ if (this.hasCats()) {
+ var tree = this;
+
+ if (cat && cat.items) {
+ var cat_unread = tree.hideReadFeeds(cat.items, hide, show_special);
+
+ var id = String(cat.id);
+ var node = tree._itemNodesMap[id];
+ var bare_id = parseInt(id.substr(id.indexOf(":")+1));
+
+ if (node) {
+ var check_unread = tree.model.getFeedUnread(bare_id, true);
+
+ if (hide && cat_unread == 0 && check_unread == 0 && (id != "CAT:-1" || !show_special)) {
+ Effect.Fade(node[0].rowNode, {duration : 0.3,
+ queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
+ } else {
+ Element.show(node[0].rowNode);
+ ++cat_unread;
+ }
}
}
}
- }
- },
- hideRead: function (hide, show_special) {
- if (this.hasCats()) {
+ },
+ hideRead: function (hide, show_special) {
+ if (this.hasCats()) {
+
+ var tree = this;
+ var cats = this.model.store._arrayOfTopLevelItems;
+ cats.each(function(cat) {
+ tree.hideReadCat(cat, hide, show_special);
+ });
+
+ } else {
+ this.hideReadFeeds(this.model.store._arrayOfTopLevelItems, hide,
+ show_special);
+ }
+ },
+ hideReadFeeds: function (items, hide, show_special) {
var tree = this;
- var cats = this.model.store._arrayOfTopLevelItems;
+ var cat_unread = 0;
- cats.each(function(cat) {
- tree.hideReadCat(cat, hide, show_special);
- });
+ items.each(function(feed) {
+ var id = String(feed.id);
- } else {
- this.hideReadFeeds(this.model.store._arrayOfTopLevelItems, hide,
- show_special);
- }
- },
- hideReadFeeds: function (items, hide, show_special) {
- var tree = this;
- var cat_unread = 0;
-
- items.each(function(feed) {
- var id = String(feed.id);
-
- // it's a subcategory
- if (feed.items) {
- tree.hideReadCat(feed, hide, show_special);
- } else { // it's a feed
- var bare_id = parseInt(feed.bare_id);;
-
- var unread = feed.unread[0];
- var has_error = feed.error[0] != '';
- var node = tree._itemNodesMap[id];
-
- if (node) {
- if (hide && unread == 0 && !has_error && (bare_id > 0 || bare_id < _label_base_index || !show_special)) {
- Effect.Fade(node[0].rowNode, {duration : 0.3,
- queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
- } else {
- Element.show(node[0].rowNode);
- ++cat_unread;
+ // it's a subcategory
+ if (feed.items) {
+ tree.hideReadCat(feed, hide, show_special);
+ } else { // it's a feed
+ var bare_id = parseInt(feed.bare_id);;
+
+ var unread = feed.unread[0];
+ var has_error = feed.error[0] != '';
+ var node = tree._itemNodesMap[id];
+
+ if (node) {
+ if (hide && unread == 0 && !has_error && (bare_id > 0 || bare_id < _label_base_index || !show_special)) {
+ Effect.Fade(node[0].rowNode, {duration : 0.3,
+ queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }});
+ } else {
+ Element.show(node[0].rowNode);
+ ++cat_unread;
+ }
}
}
- }
- });
+ });
- return cat_unread;
- },
- collapseCat: function(id) {
- if (!this.model.hasCats()) return;
+ return cat_unread;
+ },
+ collapseCat: function(id) {
+ if (!this.model.hasCats()) return;
- var tree = this;
+ var tree = this;
- var node = tree._itemNodesMap['CAT:' + id][0];
- var item = tree.model.store._itemsByIdentity['CAT:' + id];
+ var node = tree._itemNodesMap['CAT:' + id][0];
+ var item = tree.model.store._itemsByIdentity['CAT:' + id];
- if (node && item) {
- if (!node.isExpanded)
- tree._expandNode(node);
- else
- tree._collapseNode(node);
+ if (node && item) {
+ if (!node.isExpanded)
+ tree._expandNode(node);
+ else
+ tree._collapseNode(node);
- }
- },
- getVisibleUnreadFeeds: function() {
- var items = this.model.store._arrayOfAllItems;
- var rv = [];
+ }
+ },
+ getVisibleUnreadFeeds: function() {
+ var items = this.model.store._arrayOfAllItems;
+ var rv = [];
- for (var i = 0; i < items.length; i++) {
- var id = String(items[i].id);
- var box = this._itemNodesMap[id];
+ for (var i = 0; i < items.length; i++) {
+ var id = String(items[i].id);
+ var box = this._itemNodesMap[id];
- if (box) {
- var row = box[0].rowNode;
- var cat = false;
+ if (box) {
+ var row = box[0].rowNode;
+ var cat = false;
- try {
- cat = box[0].rowNode.parentNode.parentNode;
- } catch (e) { }
+ try {
+ cat = box[0].rowNode.parentNode.parentNode;
+ } catch (e) { }
- if (row) {
- if (Element.visible(row) && (!cat || Element.visible(cat))) {
- var feed_id = String(items[i].bare_id);
- var is_cat = !id.match('FEED:');
- var unread = this.model.getFeedUnread(feed_id, is_cat);
+ if (row) {
+ if (Element.visible(row) && (!cat || Element.visible(cat))) {
+ var feed_id = String(items[i].bare_id);
+ var is_cat = !id.match('FEED:');
+ var unread = this.model.getFeedUnread(feed_id, is_cat);
- if (unread > 0)
- rv.push([feed_id, is_cat]);
+ if (unread > 0)
+ rv.push([feed_id, is_cat]);
+ }
}
}
}
- }
-
- return rv;
- },
- getNextFeed: function (feed, is_cat) {
- if (is_cat) {
- treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
- } else {
- treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
- }
-
- items = this.model.store._arrayOfAllItems;
- var item = items[0];
-
- for (var i = 0; i < items.length; i++) {
- if (items[i] == treeItem) {
-
- for (var j = i+1; j < items.length; j++) {
- var id = String(items[j].id);
- var box = this._itemNodesMap[id];
-
- if (box) {
- var row = box[0].rowNode;
- var cat = box[0].rowNode.parentNode.parentNode;
-
- if (Element.visible(cat) && Element.visible(row)) {
- item = items[j];
- break;
+
+ return rv;
+ },
+ getNextFeed: function (feed, is_cat) {
+ if (is_cat) {
+ treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
+ } else {
+ treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
+ }
+
+ items = this.model.store._arrayOfAllItems;
+ var item = items[0];
+
+ for (var i = 0; i < items.length; i++) {
+ if (items[i] == treeItem) {
+
+ for (var j = i+1; j < items.length; j++) {
+ var id = String(items[j].id);
+ var box = this._itemNodesMap[id];
+
+ if (box) {
+ var row = box[0].rowNode;
+ var cat = box[0].rowNode.parentNode.parentNode;
+
+ if (Element.visible(cat) && Element.visible(row)) {
+ item = items[j];
+ break;
+ }
}
}
+ break;
}
- break;
}
- }
- if (item) {
- return [this.model.store.getValue(item, 'bare_id'),
- !this.model.store.getValue(item, 'id').match('FEED:')];
- } else {
- return false;
- }
- },
- getPreviousFeed: function (feed, is_cat) {
- if (is_cat) {
- treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
- } else {
- treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
- }
-
- items = this.model.store._arrayOfAllItems;
- var item = items[0] == treeItem ? items[items.length-1] : items[0];
-
- for (var i = 0; i < items.length; i++) {
- if (items[i] == treeItem) {
-
- for (var j = i-1; j > 0; j--) {
- var id = String(items[j].id);
- var box = this._itemNodesMap[id];
-
- if (box) {
- var row = box[0].rowNode;
- var cat = box[0].rowNode.parentNode.parentNode;
-
- if (Element.visible(cat) && Element.visible(row)) {
- item = items[j];
- break;
+ if (item) {
+ return [this.model.store.getValue(item, 'bare_id'),
+ !this.model.store.getValue(item, 'id').match('FEED:')];
+ } else {
+ return false;
+ }
+ },
+ getPreviousFeed: function (feed, is_cat) {
+ if (is_cat) {
+ treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
+ } else {
+ treeItem = this.model.store._itemsByIdentity['FEED:' + feed];
+ }
+
+ items = this.model.store._arrayOfAllItems;
+ var item = items[0] == treeItem ? items[items.length-1] : items[0];
+
+ for (var i = 0; i < items.length; i++) {
+ if (items[i] == treeItem) {
+
+ for (var j = i-1; j > 0; j--) {
+ var id = String(items[j].id);
+ var box = this._itemNodesMap[id];
+
+ if (box) {
+ var row = box[0].rowNode;
+ var cat = box[0].rowNode.parentNode.parentNode;
+
+ if (Element.visible(cat) && Element.visible(row)) {
+ item = items[j];
+ break;
+ }
}
- }
+ }
+ break;
}
- break;
}
- }
- if (item) {
- return [this.model.store.getValue(item, 'bare_id'),
- !this.model.store.getValue(item, 'id').match('FEED:')];
- } else {
- return false;
- }
+ if (item) {
+ return [this.model.store.getValue(item, 'bare_id'),
+ !this.model.store.getValue(item, 'id').match('FEED:')];
+ } else {
+ return false;
+ }
- },
- getFeedCategory: function(feed) {
- try {
- return this.getNodesByItem(this.model.store.
+ },
+ getFeedCategory: function(feed) {
+ try {
+ return this.getNodesByItem(this.model.store.
_itemsByIdentity["FEED:" + feed])[0].
- getParent().item.bare_id[0];
+ getParent().item.bare_id[0];
- } catch (e) {
- return false;
- }
- },
+ } catch (e) {
+ return false;
+ }
+ },
+ });
});
+
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index bf21baa90..c3b0d75f0 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -1,125 +1,126 @@
-dojo.provide("fox.PrefFeedTree");
-dojo.provide("fox.PrefFeedStore");
+require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
-dojo.require("lib.CheckBoxTree");
-dojo.require("dojo.data.ItemFileWriteStore");
+ return declare("fox.PrefFeedStore", dojo.data.ItemFileWriteStore, {
-dojo.declare("fox.PrefFeedStore", dojo.data.ItemFileWriteStore, {
+ _saveEverything: function(saveCompleteCallback, saveFailedCallback,
+ newFileContentString) {
- _saveEverything: function(saveCompleteCallback, saveFailedCallback,
- newFileContentString) {
+ dojo.xhrPost({
+ url: "backend.php",
+ content: {op: "pref-feeds", method: "savefeedorder",
+ payload: newFileContentString},
+ error: saveFailedCallback,
+ load: saveCompleteCallback});
+ },
- dojo.xhrPost({
- url: "backend.php",
- content: {op: "pref-feeds", method: "savefeedorder",
- payload: newFileContentString},
- error: saveFailedCallback,
- load: saveCompleteCallback});
- },
+ });
});
-dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
- _createTreeNode: function(args) {
- var tnode = this.inherited(arguments);
-
- if (args.item.icon)
- tnode.iconNode.src = args.item.icon[0];
-
- var param = this.model.store.getValue(args.item, 'param');
-
- if (param) {
- param = dojo.doc.createElement('span');
- param.className = 'feedParam';
- param.innerHTML = args.item.param[0];
- //dojo.place(param, tnode.labelNode, 'after');
- dojo.place(param, tnode.rowNode, 'first');
- }
-
- var id = args.item.id[0];
- var bare_id = parseInt(id.substr(id.indexOf(':')+1));
-
- if (id.match("CAT:") && bare_id > 0) {
- var menu = new dijit.Menu();
- menu.row_id = bare_id;
- menu.item = args.item;
-
- menu.addChild(new dijit.MenuItem({
- label: __("Edit category"),
- onClick: function() {
- editCat(this.getParent().row_id, this.getParent().item, null);
- }}));
-
-
- menu.addChild(new dijit.MenuItem({
- label: __("Remove category"),
- onClick: function() {
- removeCategory(this.getParent().row_id, this.getParent().item);
- }}));
-
- menu.bindDomNode(tnode.domNode);
- tnode._menu = menu;
- } else if (id.match("FEED:")) {
- var menu = new dijit.Menu();
- menu.row_id = bare_id;
- menu.item = args.item;
-
- menu.addChild(new dijit.MenuItem({
- label: __("Edit feed"),
- onClick: function() {
- editFeed(this.getParent().row_id);
- }}));
-
- menu.addChild(new dijit.MenuItem({
- label: __("Unsubscribe"),
- onClick: function() {
- unsubscribeFeed(this.getParent().row_id, this.getParent().item.name);
- }}));
-
- menu.bindDomNode(tnode.domNode);
- tnode._menu = menu;
-
- }
-
- return tnode;
- },
- onDndDrop: function() {
- this.inherited(arguments);
- this.tree.model.store.save();
- },
- getRowClass: function (item, opened) {
- return (!item.error || item.error == '') ? "dijitTreeRow" :
- "dijitTreeRow Error";
- },
- getIconClass: function (item, opened) {
- return (!item || this.model.store.getValue(item, 'type') == 'category') ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
- },
- checkItemAcceptance: function(target, source, position) {
- var item = dijit.getEnclosingWidget(target).item;
-
- // disable copying items
- source.copyState = function() { return false; };
-
- var source_item = false;
-
- source.forInSelectedItems(function(node) {
- source_item = node.data.item;
- });
-
- if (!source_item || !item) return false;
-
- var id = this.tree.model.store.getValue(item, 'id');
- var source_id = source.tree.model.store.getValue(source_item, 'id');
-
- //console.log(id + " " + position + " " + source_id);
-
- if (source_id.match("FEED:")) {
- return ((id.match("CAT:") && position == "over") ||
+require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
+
+ return declare("fox.PrefFeedTree", lib.CheckBoxTree, {
+ _createTreeNode: function(args) {
+ var tnode = this.inherited(arguments);
+
+ if (args.item.icon)
+ tnode.iconNode.src = args.item.icon[0];
+
+ var param = this.model.store.getValue(args.item, 'param');
+
+ if (param) {
+ param = dojo.doc.createElement('span');
+ param.className = 'feedParam';
+ param.innerHTML = args.item.param[0];
+ //dojo.place(param, tnode.labelNode, 'after');
+ dojo.place(param, tnode.rowNode, 'first');
+ }
+
+ var id = args.item.id[0];
+ var bare_id = parseInt(id.substr(id.indexOf(':')+1));
+
+ if (id.match("CAT:") && bare_id > 0) {
+ var menu = new dijit.Menu();
+ menu.row_id = bare_id;
+ menu.item = args.item;
+
+ menu.addChild(new dijit.MenuItem({
+ label: __("Edit category"),
+ onClick: function() {
+ editCat(this.getParent().row_id, this.getParent().item, null);
+ }}));
+
+
+ menu.addChild(new dijit.MenuItem({
+ label: __("Remove category"),
+ onClick: function() {
+ removeCategory(this.getParent().row_id, this.getParent().item);
+ }}));
+
+ menu.bindDomNode(tnode.domNode);
+ tnode._menu = menu;
+ } else if (id.match("FEED:")) {
+ var menu = new dijit.Menu();
+ menu.row_id = bare_id;
+ menu.item = args.item;
+
+ menu.addChild(new dijit.MenuItem({
+ label: __("Edit feed"),
+ onClick: function() {
+ editFeed(this.getParent().row_id);
+ }}));
+
+ menu.addChild(new dijit.MenuItem({
+ label: __("Unsubscribe"),
+ onClick: function() {
+ unsubscribeFeed(this.getParent().row_id, this.getParent().item.name);
+ }}));
+
+ menu.bindDomNode(tnode.domNode);
+ tnode._menu = menu;
+
+ }
+
+ return tnode;
+ },
+ onDndDrop: function() {
+ this.inherited(arguments);
+ this.tree.model.store.save();
+ },
+ getRowClass: function (item, opened) {
+ return (!item.error || item.error == '') ? "dijitTreeRow" :
+ "dijitTreeRow Error";
+ },
+ getIconClass: function (item, opened) {
+ return (!item || this.model.store.getValue(item, 'type') == 'category') ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
+ },
+ checkItemAcceptance: function(target, source, position) {
+ var item = dijit.getEnclosingWidget(target).item;
+
+ // disable copying items
+ source.copyState = function() { return false; };
+
+ var source_item = false;
+
+ source.forInSelectedItems(function(node) {
+ source_item = node.data.item;
+ });
+
+ if (!source_item || !item) return false;
+
+ var id = this.tree.model.store.getValue(item, 'id');
+ var source_id = source.tree.model.store.getValue(source_item, 'id');
+
+ //console.log(id + " " + position + " " + source_id);
+
+ if (source_id.match("FEED:")) {
+ return ((id.match("CAT:") && position == "over") ||
(id.match("FEED:") && position != "over"));
- } else if (source_id.match("CAT:")) {
- return ((id.match("CAT:") && !id.match("CAT:0")) ||
+ } else if (source_id.match("CAT:")) {
+ return ((id.match("CAT:") && !id.match("CAT:0")) ||
(id.match("root") && position == "over"));
- }
- },
+ }
+ },
+ });
});
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index ba06bbef4..5e055646c 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -1,96 +1,102 @@
-dojo.provide("fox.PrefFilterTree");
+require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
-dojo.require("lib.CheckBoxTree");
-dojo.require("dojo.data.ItemFileWriteStore");
+ return declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
-dojo.declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
+ _saveEverything: function (saveCompleteCallback, saveFailedCallback,
+ newFileContentString) {
- _saveEverything: function(saveCompleteCallback, saveFailedCallback,
- newFileContentString) {
-
- dojo.xhrPost({
- url: "backend.php",
- content: {op: "pref-filters", method: "savefilterorder",
- payload: newFileContentString},
- error: saveFailedCallback,
- load: saveCompleteCallback});
- },
+ dojo.xhrPost({
+ url: "backend.php",
+ content: {
+ op: "pref-filters", method: "savefilterorder",
+ payload: newFileContentString
+ },
+ error: saveFailedCallback,
+ load: saveCompleteCallback
+ });
+ },
+ });
});
-dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
- _createTreeNode: function(args) {
- var tnode = this.inherited(arguments);
-
- var enabled = this.model.store.getValue(args.item, 'enabled');
- var param = this.model.store.getValue(args.item, 'param');
- var rules = this.model.store.getValue(args.item, 'rules');
-
- if (param) {
- param = dojo.doc.createElement('span');
- param.className = (enabled != false) ? 'labelParam' : 'labelParam filterDisabled';
- param.innerHTML = args.item.param[0];
- dojo.place(param, tnode.rowNode, 'first');
- }
-
- if (rules) {
- param = dojo.doc.createElement('span');
- param.className = 'filterRules';
- param.innerHTML = rules;
- dojo.place(param, tnode.rowNode, 'next');
- }
-
- if (this.model.store.getValue(args.item, 'id') != 'root') {
- var img = dojo.doc.createElement('img');
- img.src ='images/filter.png';
- img.className = 'markedPic';
- tnode._filterIconNode = img;
- dojo.place(tnode._filterIconNode, tnode.labelNode, 'before');
- }
-
- return tnode;
- },
-
- getLabel: function(item) {
- var label = item.name;
-
- var feed = this.model.store.getValue(item, 'feed');
- var inverse = this.model.store.getValue(item, 'inverse');
-
- if (feed)
- label += " (" + __("in") + " " + feed + ")";
-
- if (inverse)
- label += " (" + __("Inverse") + ")";
-
-/* if (item.param)
- label = "<span class=\"labelFixedLength\">" + label +
- "</span>" + item.param[0]; */
-
- return label;
- },
- getIconClass: function (item, opened) {
- return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
- },
- getLabelClass: function (item, opened) {
- var enabled = this.model.store.getValue(item, 'enabled');
- return (enabled != false) ? "dijitTreeLabel labelFixedLength" : "dijitTreeLabel labelFixedLength filterDisabled";
- },
- getRowClass: function (item, opened) {
- return (!item.error || item.error == '') ? "dijitTreeRow" :
- "dijitTreeRow Error";
- },
- checkItemAcceptance: function(target, source, position) {
- var item = dijit.getEnclosingWidget(target).item;
-
- // disable copying items
- source.copyState = function() { return false; };
-
- return position != 'over';
- },
- onDndDrop: function() {
- this.inherited(arguments);
- this.tree.model.store.save();
- },
+require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
+
+ return declare("fox.PrefFilterTree", lib.CheckBoxTree, {
+ _createTreeNode: function(args) {
+ var tnode = this.inherited(arguments);
+
+ var enabled = this.model.store.getValue(args.item, 'enabled');
+ var param = this.model.store.getValue(args.item, 'param');
+ var rules = this.model.store.getValue(args.item, 'rules');
+
+ if (param) {
+ param = dojo.doc.createElement('span');
+ param.className = (enabled != false) ? 'labelParam' : 'labelParam filterDisabled';
+ param.innerHTML = args.item.param[0];
+ dojo.place(param, tnode.rowNode, 'first');
+ }
+
+ if (rules) {
+ param = dojo.doc.createElement('span');
+ param.className = 'filterRules';
+ param.innerHTML = rules;
+ dojo.place(param, tnode.rowNode, 'next');
+ }
+
+ if (this.model.store.getValue(args.item, 'id') != 'root') {
+ var img = dojo.doc.createElement('img');
+ img.src ='images/filter.png';
+ img.className = 'markedPic';
+ tnode._filterIconNode = img;
+ dojo.place(tnode._filterIconNode, tnode.labelNode, 'before');
+ }
+
+ return tnode;
+ },
+
+ getLabel: function(item) {
+ var label = item.name;
+
+ var feed = this.model.store.getValue(item, 'feed');
+ var inverse = this.model.store.getValue(item, 'inverse');
+
+ if (feed)
+ label += " (" + __("in") + " " + feed + ")";
+
+ if (inverse)
+ label += " (" + __("Inverse") + ")";
+
+ /* if (item.param)
+ label = "<span class=\"labelFixedLength\">" + label +
+ "</span>" + item.param[0]; */
+
+ return label;
+ },
+ getIconClass: function (item, opened) {
+ return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
+ },
+ getLabelClass: function (item, opened) {
+ var enabled = this.model.store.getValue(item, 'enabled');
+ return (enabled != false) ? "dijitTreeLabel labelFixedLength" : "dijitTreeLabel labelFixedLength filterDisabled";
+ },
+ getRowClass: function (item, opened) {
+ return (!item.error || item.error == '') ? "dijitTreeRow" :
+ "dijitTreeRow Error";
+ },
+ checkItemAcceptance: function(target, source, position) {
+ var item = dijit.getEnclosingWidget(target).item;
+
+ // disable copying items
+ source.copyState = function() { return false; };
+
+ return position != 'over';
+ },
+ onDndDrop: function() {
+ this.inherited(arguments);
+ this.tree.model.store.save();
+ },
+ });
+
});
+
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 2f7dc0f53..673fd19ad 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -1,43 +1,43 @@
-dojo.provide("fox.PrefLabelTree");
+require(["dojo/_base/declare", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare) {
-dojo.require("lib.CheckBoxTree");
-dojo.require("dijit.form.DropDownButton");
+ return declare("fox.PrefLabelTree", lib.CheckBoxTree, {
+ setNameById: function (id, name) {
+ var item = this.model.store._itemsByIdentity['LABEL:' + id];
-dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
- setNameById: function (id, name) {
- var item = this.model.store._itemsByIdentity['LABEL:' + id];
+ if (item)
+ this.model.store.setValue(item, 'name', name);
- if (item)
- this.model.store.setValue(item, 'name', name);
+ },
+ _createTreeNode: function(args) {
+ var tnode = this.inherited(arguments);
- },
- _createTreeNode: function(args) {
- var tnode = this.inherited(arguments);
+ var fg_color = this.model.store.getValue(args.item, 'fg_color');
+ var bg_color = this.model.store.getValue(args.item, 'bg_color');
+ var type = this.model.store.getValue(args.item, 'type');
+ var bare_id = this.model.store.getValue(args.item, 'bare_id');
- var fg_color = this.model.store.getValue(args.item, 'fg_color');
- var bg_color = this.model.store.getValue(args.item, 'bg_color');
- var type = this.model.store.getValue(args.item, 'type');
- var bare_id = this.model.store.getValue(args.item, 'bare_id');
+ if (type == 'label') {
+ var span = dojo.doc.createElement('span');
+ span.innerHTML = '&alpha;';
+ span.className = 'labelColorIndicator';
+ span.id = 'LICID-' + bare_id;
- if (type == 'label') {
- var span = dojo.doc.createElement('span');
- span.innerHTML = '&alpha;';
- span.className = 'labelColorIndicator';
- span.id = 'LICID-' + bare_id;
+ span.setStyle({
+ color: fg_color,
+ backgroundColor: bg_color});
- span.setStyle({
- color: fg_color,
- backgroundColor: bg_color});
+ tnode._labelIconNode = span;
- tnode._labelIconNode = span;
+ dojo.place(tnode._labelIconNode, tnode.labelNode, 'before');
+ }
- dojo.place(tnode._labelIconNode, tnode.labelNode, 'before');
- }
+ return tnode;
+ },
+ getIconClass: function (item, opened) {
+ return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
+ },
+ });
- return tnode;
- },
- getIconClass: function (item, opened) {
- return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
- },
});
+
diff --git a/js/prefs.js b/js/prefs.js
index ddcdbe351..fdbb51ec0 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -889,22 +889,20 @@ function init_second_stage() {
loading_set_progress(50);
notify("");
- dojo.addOnLoad(function() {
- var tab = getURLParam('tab');
+ var tab = getURLParam('tab');
- if (tab) {
- tab = dijit.byId(tab + "Tab");
- if (tab) dijit.byId("pref-tabs").selectChild(tab);
- }
+ if (tab) {
+ tab = dijit.byId(tab + "Tab");
+ if (tab) dijit.byId("pref-tabs").selectChild(tab);
+ }
- var method = getURLParam('method');
+ var method = getURLParam('method');
- if (method == 'editFeed') {
- var param = getURLParam('methodparam');
+ if (method == 'editFeed') {
+ var param = getURLParam('methodparam');
- window.setTimeout('editFeed(' + param + ')', 100);
- }
- });
+ window.setTimeout('editFeed(' + param + ')', 100);
+ }
setTimeout("hotkey_prefix_timeout()", 5*1000);
@@ -916,53 +914,55 @@ function init_second_stage() {
function init() {
try {
- dojo.registerModulePath("lib", "..");
- dojo.registerModulePath("fox", "../../js/");
-
- dojo.require("dijit.ColorPalette");
- dojo.require("dijit.Dialog");
- dojo.require("dijit.form.Button");
- dojo.require("dijit.form.CheckBox");
- dojo.require("dijit.form.DropDownButton");
- dojo.require("dijit.form.FilteringSelect");
- dojo.require("dijit.form.Form");
- dojo.require("dijit.form.RadioButton");
- dojo.require("dijit.form.Select");
- dojo.require("dijit.form.SimpleTextarea");
- dojo.require("dijit.form.TextBox");
- dojo.require("dijit.form.ValidationTextBox");
- dojo.require("dijit.InlineEditBox");
- dojo.require("dijit.layout.AccordionContainer");
- dojo.require("dijit.layout.BorderContainer");
- dojo.require("dijit.layout.ContentPane");
- dojo.require("dijit.layout.TabContainer");
- dojo.require("dijit.Menu");
- dojo.require("dijit.ProgressBar");
- dojo.require("dijit.ProgressBar");
- dojo.require("dijit.Toolbar");
- dojo.require("dijit.Tree");
- dojo.require("dijit.tree.dndSource");
- dojo.require("dojo.data.ItemFileWriteStore");
-
- dojo.require("lib.CheckBoxTree");
- dojo.require("fox.PrefFeedTree");
- dojo.require("fox.PrefFilterTree");
- dojo.require("fox.PrefLabelTree");
-
- dojo.parser.parse();
-
- dojo.addOnLoad(function() {
- loading_set_progress(50);
-
- var clientTzOffset = new Date().getTimezoneOffset() * 60;
- new Ajax.Request("backend.php", {
- parameters: {op: "rpc", method: "sanityCheck",
- clientTzOffset: clientTzOffset },
- onComplete: function(transport) {
- backend_sanity_check_callback(transport);
- } });
- });
+ require(["dojo/_base/kernel",
+ "dojo/ready",
+ "dojo/parser",
+ "dojo/_base/loader",
+ "dijit/ColorPalette",
+ "dijit/Dialog",
+ "dijit/form/Button",
+ "dijit/form/CheckBox",
+ "dijit/form/DropDownButton",
+ "dijit/form/FilteringSelect",
+ "dijit/form/Form",
+ "dijit/form/RadioButton",
+ "dijit/form/ComboButton",
+ "dijit/form/Select",
+ "dijit/form/SimpleTextarea",
+ "dijit/form/TextBox",
+ "dijit/form/ValidationTextBox",
+ "dijit/InlineEditBox",
+ "dijit/layout/AccordionContainer",
+ "dijit/layout/AccordionPane",
+ "dijit/layout/BorderContainer",
+ "dijit/layout/ContentPane",
+ "dijit/layout/TabContainer",
+ "dijit/Menu",
+ "dijit/ProgressBar",
+ "dijit/Toolbar",
+ "dijit/Tree",
+ "dijit/tree/dndSource",
+ "dojo/data/ItemFileWriteStore",
+ "fox/PrefFeedTree",
+ "fox/PrefFilterTree",
+ "fox/PrefLabelTree" ], function (dojo, ready, parser) {
+
+ ready(function() {
+ parser.parse();
+
+ loading_set_progress(50);
+
+ var clientTzOffset = new Date().getTimezoneOffset() * 60;
+
+ new Ajax.Request("backend.php", {
+ parameters: {op: "rpc", method: "sanityCheck",
+ clientTzOffset: clientTzOffset },
+ onComplete: function(transport) {
+ backend_sanity_check_callback(transport);
+ } });
+ });
+ });
} catch (e) {
exception_error("init", e);
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 2f738810b..1b84025d1 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -218,372 +218,395 @@ function init() {
try {
//dojo.registerModulePath("fox", "../../js/");
- dojo.require("fox.FeedTree");
-
- dojo.require("dijit.ColorPalette");
- dojo.require("dijit.Dialog");
- dojo.require("dijit.form.Button");
- dojo.require("dijit.form.CheckBox");
- dojo.require("dijit.form.DropDownButton");
- dojo.require("dijit.form.FilteringSelect");
- dojo.require("dijit.form.Form");
- dojo.require("dijit.form.RadioButton");
- 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");
- dojo.require("dijit.layout.BorderContainer");
- dojo.require("dijit.layout.ContentPane");
- dojo.require("dijit.layout.TabContainer");
- dojo.require("dijit.Menu");
- dojo.require("dijit.ProgressBar");
- dojo.require("dijit.ProgressBar");
- dojo.require("dijit.Toolbar");
- dojo.require("dijit.Tree");
- dojo.require("dijit.tree.dndSource");
- dojo.require("dojo.data.ItemFileWriteStore");
-
- dojo.parser.parse();
-
- if (!genericSanityCheck())
- return false;
-
- loading_set_progress(30);
-
- var a = document.createElement('audio');
+ require(["dojo/_base/kernel",
+ "dojo/ready",
+ "dojo/parser",
+ "dojo/_base/loader",
+ "dijit/ProgressBar",
+ "dijit/ColorPalette",
+ "dijit/Dialog",
+ "dijit/form/Button",
+ "dijit/form/ComboButton",
+ "dijit/form/CheckBox",
+ "dijit/form/DropDownButton",
+ "dijit/form/FilteringSelect",
+ "dijit/form/Form",
+ "dijit/form/RadioButton",
+ "dijit/form/Select",
+ "dijit/form/SimpleTextarea",
+ "dijit/form/TextBox",
+ "dijit/form/ComboBox",
+ "dijit/form/ValidationTextBox",
+ "dijit/InlineEditBox",
+ "dijit/layout/AccordionContainer",
+ "dijit/layout/BorderContainer",
+ "dijit/layout/ContentPane",
+ "dijit/layout/TabContainer",
+ "dijit/PopupMenuItem",
+ "dijit/Menu",
+ "dijit/Toolbar",
+ "dijit/Tree",
+ "dijit/tree/dndSource",
+ "dijit/tree/ForestStoreModel",
+ "dojo/data/ItemFileWriteStore",
+ "fox/FeedTree" ], function (dojo, ready, parser) {
+
+ ready(function() {
+
+ parser.parse();
+
+ if (!genericSanityCheck())
+ return false;
+
+ loading_set_progress(30);
+
+ var a = document.createElement('audio');
+
+ 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;
+
+ init_hotkey_actions();
+
+ 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 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);
- } });
-
- hotkey_actions["next_feed"] = function() {
- var rv = dijit.byId("feedTree").getNextFeed(
- getActiveFeedId(), activeFeedIsCat());
+ });
- 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());
+ } catch (e) {
+ exception_error("init", e);
+ }
+}
- if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
- };
- hotkey_actions["next_article"] = function() {
- moveToPost('next');
- };
- hotkey_actions["prev_article"] = function() {
- moveToPost('prev');
- };
- hotkey_actions["next_article_noscroll"] = function() {
- moveToPost('next', true);
- };
- 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) {
- if (elem.visible()) {
- cdmCollapseArticle(null, 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() {
- search();
- };
- hotkey_actions["toggle_mark"] = function() {
- selectionToggleMarked(undefined, false, true);
- };
- hotkey_actions["toggle_publ"] = function() {
- selectionTogglePublished(undefined, false, true);
- };
- hotkey_actions["toggle_unread"] = function() {
- selectionToggleUnread(undefined, false, true);
- };
- hotkey_actions["edit_tags"] = function() {
- var id = getActiveArticleId();
- if (id) {
- editArticleTags(id);
- };
+function init_hotkey_actions() {
+ hotkey_actions["next_feed"] = function() {
+ var rv = dijit.byId("feedTree").getNextFeed(
+ getActiveFeedId(), activeFeedIsCat());
+
+ 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({feed: rv[0], is_cat: rv[1], can_wait: true})
+ };
+ hotkey_actions["next_article"] = function() {
+ moveToPost('next');
+ };
+ hotkey_actions["prev_article"] = function() {
+ moveToPost('prev');
+ };
+ hotkey_actions["next_article_noscroll"] = function() {
+ moveToPost('next', true);
+ };
+ 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) {
+ if (elem.visible()) {
+ cdmCollapseArticle(null, id);
}
- hotkey_actions["open_in_new_window"] = function() {
- if (getActiveArticleId()) {
- openArticleInNewWindow(getActiveArticleId());
- return;
- }
- };
- hotkey_actions["catchup_below"] = function() {
- catchupRelativeToArticle(1);
- };
- hotkey_actions["catchup_above"] = function() {
- catchupRelativeToArticle(0);
+ 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() {
+ search();
+ };
+ hotkey_actions["toggle_mark"] = function() {
+ selectionToggleMarked(undefined, false, true);
+ };
+ hotkey_actions["toggle_publ"] = function() {
+ selectionTogglePublished(undefined, false, true);
+ };
+ hotkey_actions["toggle_unread"] = function() {
+ selectionToggleUnread(undefined, false, true);
+ };
+ hotkey_actions["edit_tags"] = function() {
+ var id = getActiveArticleId();
+ if (id) {
+ editArticleTags(id);
};
- hotkey_actions["article_scroll_down"] = function() {
- var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+ }
+ hotkey_actions["open_in_new_window"] = function() {
+ if (getActiveArticleId()) {
+ openArticleInNewWindow(getActiveArticleId());
+ return;
+ }
+ };
+ hotkey_actions["catchup_below"] = function() {
+ catchupRelativeToArticle(1);
+ };
+ hotkey_actions["catchup_above"] = function() {
+ catchupRelativeToArticle(0);
+ };
+ hotkey_actions["article_scroll_down"] = function() {
+ var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+ scrollArticle(40);
+ };
+ hotkey_actions["article_scroll_up"] = function() {
+ var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+ scrollArticle(-40);
+ };
+ hotkey_actions["close_article"] = function() {
+ if (isCdmMode()) {
+ if (!getInitParam("cdm_expanded")) {
+ cdmCollapseArticle(false, getActiveArticleId());
+ }
+ } else {
+ closeArticlePanel();
+ }
+ };
+ hotkey_actions["email_article"] = function() {
+ if (typeof emailArticle != "undefined") {
+ emailArticle();
+ } else if (typeof mailtoArticle != "undefined") {
+ mailtoArticle();
+ } else {
+ alert(__("Please enable mail plugin first."));
+ }
+ };
+ hotkey_actions["select_all"] = function() {
+ selectArticles('all');
+ };
+ hotkey_actions["select_unread"] = function() {
+ selectArticles('unread');
+ };
+ hotkey_actions["select_marked"] = function() {
+ selectArticles('marked');
+ };
+ hotkey_actions["select_published"] = function() {
+ selectArticles('published');
+ };
+ hotkey_actions["select_invert"] = function() {
+ selectArticles('invert');
+ };
+ hotkey_actions["select_none"] = function() {
+ selectArticles('none');
+ };
+ hotkey_actions["feed_refresh"] = function() {
+ if (getActiveFeedId() != undefined) {
+ viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
+ return;
+ }
+ };
+ hotkey_actions["feed_unhide_read"] = function() {
+ toggleDispRead();
+ };
+ hotkey_actions["feed_subscribe"] = function() {
+ quickAddFeed();
+ };
+ hotkey_actions["feed_debug_update"] = function() {
+ 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.");
+ }
+ };
- scrollArticle(40);
- };
- hotkey_actions["article_scroll_up"] = function() {
- var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+ hotkey_actions["feed_debug_viewfeed"] = function() {
+ viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
+ };
- scrollArticle(-40);
- };
- hotkey_actions["close_article"] = function() {
- if (isCdmMode()) {
- if (!getInitParam("cdm_expanded")) {
- cdmCollapseArticle(false, getActiveArticleId());
- }
- } else {
- closeArticlePanel();
- }
- };
- hotkey_actions["email_article"] = function() {
- if (typeof emailArticle != "undefined") {
- emailArticle();
- } else if (typeof mailtoArticle != "undefined") {
- mailtoArticle();
- } else {
- alert(__("Please enable mail plugin first."));
- }
- };
- hotkey_actions["select_all"] = function() {
- selectArticles('all');
- };
- hotkey_actions["select_unread"] = function() {
- selectArticles('unread');
- };
- hotkey_actions["select_marked"] = function() {
- selectArticles('marked');
- };
- hotkey_actions["select_published"] = function() {
- selectArticles('published');
- };
- hotkey_actions["select_invert"] = function() {
- selectArticles('invert');
- };
- hotkey_actions["select_none"] = function() {
- selectArticles('none');
- };
- hotkey_actions["feed_refresh"] = function() {
- if (getActiveFeedId() != undefined) {
- viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
- return;
- }
- };
- hotkey_actions["feed_unhide_read"] = function() {
- toggleDispRead();
- };
- hotkey_actions["feed_subscribe"] = function() {
- quickAddFeed();
- };
- hotkey_actions["feed_debug_update"] = function() {
- 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_edit"] = function() {
+ if (activeFeedIsCat())
+ alert(__("You can't edit this kind of feed."));
+ else
+ editFeed(getActiveFeedId());
+ };
+ hotkey_actions["feed_catchup"] = function() {
+ if (getActiveFeedId() != undefined) {
+ catchupCurrentFeed();
+ return;
+ }
+ };
+ hotkey_actions["feed_reverse"] = function() {
+ reverseHeadlineOrder();
+ };
+ hotkey_actions["feed_toggle_vgroup"] = function() {
+ var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
- hotkey_actions["feed_debug_viewfeed"] = function() {
- viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
- };
+ new Ajax.Request("backend.php", {
+ parameters: query_str,
+ onComplete: function(transport) {
+ viewCurrentFeed();
+ } });
- hotkey_actions["feed_edit"] = function() {
- if (activeFeedIsCat())
- alert(__("You can't edit this kind of feed."));
- else
- editFeed(getActiveFeedId());
- };
- hotkey_actions["feed_catchup"] = function() {
- if (getActiveFeedId() != undefined) {
- catchupCurrentFeed();
- return;
- }
- };
- hotkey_actions["feed_reverse"] = function() {
- reverseHeadlineOrder();
- };
- hotkey_actions["catchup_all"] = function() {
- catchupAllFeeds();
- };
- hotkey_actions["cat_toggle_collapse"] = function() {
- if (activeFeedIsCat()) {
- dijit.byId("feedTree").collapseCat(getActiveFeedId());
- return;
- }
- };
- hotkey_actions["goto_all"] = function() {
- viewfeed({feed: -4});
- };
- hotkey_actions["goto_fresh"] = function() {
- viewfeed({feed: -3});
- };
- hotkey_actions["goto_marked"] = function() {
- viewfeed({feed: -1});
- };
- hotkey_actions["goto_published"] = function() {
- viewfeed({feed: -2});
- };
- hotkey_actions["goto_tagcloud"] = function() {
- displayDlg(__("Tag cloud"), "printTagCloud");
- };
- hotkey_actions["goto_prefs"] = function() {
- gotoPreferences();
- };
- hotkey_actions["select_article_cursor"] = function() {
- var id = getArticleUnderPointer();
- if (id) {
- 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;
- }
- }
- }
- };
- hotkey_actions["create_label"] = function() {
- addLabel();
- };
- hotkey_actions["create_filter"] = function() {
- quickAddFilter();
- };
- hotkey_actions["collapse_sidebar"] = function() {
- collapse_feedlist();
- };
- hotkey_actions["toggle_embed_original"] = function() {
- if (typeof embedOriginalArticle != "undefined") {
- if (getActiveArticleId())
- embedOriginalArticle(getActiveArticleId());
- } else {
- alert(__("Please enable embed_original plugin first."));
+ };
+ hotkey_actions["catchup_all"] = function() {
+ catchupAllFeeds();
+ };
+ hotkey_actions["cat_toggle_collapse"] = function() {
+ if (activeFeedIsCat()) {
+ dijit.byId("feedTree").collapseCat(getActiveFeedId());
+ return;
+ }
+ };
+ hotkey_actions["goto_all"] = function() {
+ viewfeed({feed: -4});
+ };
+ hotkey_actions["goto_fresh"] = function() {
+ viewfeed({feed: -3});
+ };
+ hotkey_actions["goto_marked"] = function() {
+ viewfeed({feed: -1});
+ };
+ hotkey_actions["goto_published"] = function() {
+ viewfeed({feed: -2});
+ };
+ hotkey_actions["goto_tagcloud"] = function() {
+ displayDlg(__("Tag cloud"), "printTagCloud");
+ };
+ hotkey_actions["goto_prefs"] = function() {
+ gotoPreferences();
+ };
+ hotkey_actions["select_article_cursor"] = function() {
+ var id = getArticleUnderPointer();
+ if (id) {
+ 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;
}
- };
- hotkey_actions["toggle_widescreen"] = function() {
- if (!isCdmMode()) {
- _widescreen_mode = !_widescreen_mode;
+ }
+ }
+ };
+ hotkey_actions["create_label"] = function() {
+ addLabel();
+ };
+ hotkey_actions["create_filter"] = function() {
+ quickAddFilter();
+ };
+ hotkey_actions["collapse_sidebar"] = function() {
+ collapse_feedlist();
+ };
+ hotkey_actions["toggle_embed_original"] = function() {
+ if (typeof embedOriginalArticle != "undefined") {
+ if (getActiveArticleId())
+ embedOriginalArticle(getActiveArticleId());
+ } else {
+ alert(__("Please enable embed_original plugin first."));
+ }
+ };
+ hotkey_actions["toggle_widescreen"] = function() {
+ if (!isCdmMode()) {
+ _widescreen_mode = !_widescreen_mode;
- // reset stored sizes because geometry changed
- setCookie("ttrss_ci_width", 0);
- setCookie("ttrss_ci_height", 0);
+ // 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() {
- helpDialog("main");
- };
- hotkey_actions["toggle_combined_mode"] = function() {
- notify_progress("Loading, please wait...");
+ switchPanelMode(_widescreen_mode);
+ } else {
+ alert(__("Widescreen is not available in combined mode."));
+ }
+ };
+ hotkey_actions["help_dialog"] = function() {
+ helpDialog("main");
+ };
+ hotkey_actions["toggle_combined_mode"] = function() {
+ notify_progress("Loading, please wait...");
- var value = isCdmMode() ? "false" : "true";
- var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
+ var value = isCdmMode() ? "false" : "true";
+ var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- setInitParam("combined_display_mode",
- !getInitParam("combined_display_mode"));
+ new Ajax.Request("backend.php", {
+ parameters: query,
+ onComplete: function(transport) {
+ setInitParam("combined_display_mode",
+ !getInitParam("combined_display_mode"));
- closeArticlePanel();
- viewCurrentFeed();
+ closeArticlePanel();
+ viewCurrentFeed();
- } });
- };
- hotkey_actions["toggle_cdm_expanded"] = function() {
- notify_progress("Loading, please wait...");
-
- var value = getInitParam("cdm_expanded") ? "false" : "true";
- var query = "?op=rpc&method=setpref&key=CDM_EXPANDED&value=" + value;
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
- viewCurrentFeed();
- } });
- };
+ } });
+ };
+ hotkey_actions["toggle_cdm_expanded"] = function() {
+ notify_progress("Loading, please wait...");
+ var value = getInitParam("cdm_expanded") ? "false" : "true";
+ var query = "?op=rpc&method=setpref&key=CDM_EXPANDED&value=" + value;
- } catch (e) {
- exception_error("init", e);
- }
+ new Ajax.Request("backend.php", {
+ parameters: query,
+ onComplete: function(transport) {
+ setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
+ viewCurrentFeed();
+ } });
+ };
}
function init_second_stage() {
try {
- dojo.addOnLoad(function() {
- updateFeedList();
- closeArticlePanel();
-
- if (parseInt(getCookie("ttrss_fh_width")) > 0) {
- dijit.byId("feeds-holder").domNode.setStyle(
- {width: getCookie("ttrss_fh_width") + "px" });
- }
+ updateFeedList();
+ closeArticlePanel();
- dijit.byId("main").resize();
+ if (parseInt(getCookie("ttrss_fh_width")) > 0) {
+ dijit.byId("feeds-holder").domNode.setStyle(
+ {width: getCookie("ttrss_fh_width") + "px" });
+ }
- 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"));
- }
- });
+ dijit.byId("main").resize();
- 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"));
- }
- });
+ 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");