diff options
| author | Anders Kaseorg <[email protected]> | 2017-01-20 12:29:59 -0500 |
|---|---|---|
| committer | Anders Kaseorg <[email protected]> | 2017-01-21 13:22:14 -0500 |
| commit | 6887a0f57307820b097b51aee952c555bcf69024 (patch) | |
| tree | ff041c03ac0251468eb4308927052f8bd6071ca3 /js | |
| parent | 9f539be3c2c93ce358b10ca396e922b3b99b56ea (diff) | |
lib: Upgrade Dojo and Dijit from 1.8.3 to 1.12.1
The itemNode and expandoNode elements have changed from img to
span (https://bugs.dojotoolkit.org/ticket/16699), so we now put our
tree icons inside them rather than replacing them.
Signed-off-by: Anders Kaseorg <[email protected]>
Diffstat (limited to 'js')
| -rw-r--r-- | js/FeedTree.js | 21 | ||||
| -rw-r--r-- | js/PrefFeedTree.js | 8 |
2 files changed, 22 insertions, 7 deletions
diff --git a/js/FeedTree.js b/js/FeedTree.js index 5052f38dc..320f99264 100644 --- 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; } } diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index c3a089d00..3cf8257be 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -23,8 +23,12 @@ require(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functi _createTreeNode: function(args) { var tnode = this.inherited(arguments); - if (args.item.icon) - tnode.iconNode.src = args.item.icon[0]; + if (args.item.icon) { + var icon = dojo.doc.createElement('img'); + icon.src = args.item.icon[0]; + icon.className = 'tinyFeedIcon'; + domConstruct.place(icon, tnode.iconNode, 'only'); + } var param = this.model.store.getValue(args.item, 'param'); |