diff options
author | Richard Beales <[email protected]> | 2013-03-19 18:19:07 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-19 18:19:07 +0000 |
commit | 05809dfdf7cbf7699be6408c0f49d325585726b5 (patch) | |
tree | bfa33dcd1cf8707e65a05df98d27d563396520d2 /js/FeedTree.js | |
parent | 1d707e9f03d1a654e0807aadce7ab790befd0b95 (diff) | |
parent | 2229e6ed6b07d4a28b04689a21c645bdb83652f7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js/FeedTree.js')
-rw-r--r-- | js/FeedTree.js | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/js/FeedTree.js b/js/FeedTree.js index 2cb6346e4..b02d8ad7c 100644 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -162,6 +162,13 @@ dojo.declare("fox.FeedTree", dijit.Tree, { tnode._menu = menu; } + if (id.match("CAT:")) { + loading = dojo.doc.createElement('img'); + loading.className = 'loadingNode'; + 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; @@ -243,8 +250,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, { if (treeNode) { treeNode = treeNode[0]; - treeNode.expandoNode.src = src; - return true; + if (is_cat) { + if (treeNode.loadingNode) { + treeNode.loadingNode.src = src; + return true; + } + } else { + treeNode.expandoNode.src = src; + return true; + } } return false; @@ -309,7 +323,7 @@ dojo.declare("fox.FeedTree", dijit.Tree, { var node = tree._itemNodesMap[id]; if (node) { - if (hide && unread == 0 && (bare_id > 0 || !show_special)) { + if (hide && unread == 0 && (bare_id > 0 || bare_id < -10 || !show_special)) { Effect.Fade(node[0].rowNode, {duration : 0.3, queue: { position: 'end', scope: 'FFADE-' + id, limit: 1 }}); } else { |