lib: Upgrade Dojo and Dijit from 1.8.3 to 1.12.1

[tt-rss.git] / js / FeedTree.js

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 5052f38dc28db8d9f3ebab2a8bc3f703d18f72fa..320f9926418a5196f2022be991fdb09f03664a0f 100644 (file)
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -104,8 +104,14 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
                _createTreeNode: function(args) {
                        var tnode = new dijit._TreeNode(args);
 
-                       if (args.item.icon && args.item.icon[0])
-                               tnode.iconNode.src = args.item.icon[0];
+                       var icon = dojo.doc.createElement('img');
+                       if (args.item.icon && args.item.icon[0]) {
+                               icon.src = args.item.icon[0];
+                       } else {
+                               icon.src = 'images/blank_icon.gif';
+                       }
+                       icon.className = 'tinyFeedIcon';
+                       domConstruct.place(icon, tnode.iconNode, 'only');
 
                        var id = args.item.id[0];
                        var bare_id = parseInt(id.substr(id.indexOf(':')+1));
@@ -121,7 +127,7 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
                                        color: fg_color,
                                        backgroundColor: bg_color});
 
-                               domConstruct.place(span, tnode.iconNode, 'replace');
+                               domConstruct.place(span, tnode.iconNode, 'only');
                        }
 
                        if (id.match("FEED:")) {
@@ -358,7 +364,10 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
 
                        if (treeNode) {
                                treeNode = treeNode[0];
-                               treeNode.iconNode.src = src;
+                               var icon = dojo.doc.createElement('img');
+                               icon.src = src;
+                               icon.className = 'tinyFeedIcon';
+                               domConstruct.place(icon, treeNode.iconNode, 'only');
                                return true;
                        }
                        return false;
@@ -375,7 +384,9 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
                                        treeNode.loadingNode.src = src;
                                        return true;
                                } else {
-                                       treeNode.expandoNode.src = src;
+                                       var icon = dojo.doc.createElement('img');
+                                       icon.src = src;
+                                       domConstruct.place(icon, treeNode.expandoNode, 'only');
                                        return true;
                                }
                        }