Merge branch 'dojo-1.12.1'

Conflicts:
	js/prefs.js

6 files changed, 37 insertions, 19 deletions

diff --git a/js/FeedTree.js b/js/FeedTree.js
index dc35619ea..320f99264 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -95,7 +95,7 @@ require(["dojo/_base/declare", "dijit/tree/ForestStoreModel"], function (declare
 	});
 });
 
-require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
+require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"], function (declare, domConstruct) {
 
 	return declare("fox.FeedTree", dijit.Tree, {
 		_onKeyPress: function(/* Event */ e) {
@@ -104,8 +104,14 @@ require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
 		_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", "dijit/Tree", "dijit/Menu"], function (declare) {
 					color: fg_color,
 					backgroundColor: bg_color});
 
-				dojo.place(span, tnode.iconNode, 'replace');
+				domConstruct.place(span, tnode.iconNode, 'only');
 			}
 
 			if (id.match("FEED:")) {
@@ -176,7 +182,7 @@ require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
 				loading = dojo.doc.createElement('img');
 				loading.className = 'loadingNode';
 				loading.src = 'images/blank_icon.gif';
-				dojo.place(loading, tnode.labelNode, 'after');
+				domConstruct.place(loading, tnode.labelNode, 'after');
 				tnode.loadingNode = loading;
 			}
 
@@ -204,7 +210,7 @@ require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
 
 			args.item.unread == 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
 
-			dojo.place(ctr, tnode.rowNode, 'first');
+			domConstruct.place(ctr, tnode.rowNode, 'first');
 			tnode.counterNode = ctr;
 
 			//tnode.labelNode.innerHTML = args.label;
@@ -358,7 +364,10 @@ require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
 
 			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", "dijit/Tree", "dijit/Menu"], function (declare) {
 					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 c3b0d75f0..3cf8257be 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -17,14 +17,18 @@ require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declar
 
 });
 
-require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
+require(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], function (declare, domConstruct) {
 
 	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];
+			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');
 
@@ -32,8 +36,8 @@ require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
 				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');
+				//domConstruct.place(param, tnode.labelNode, 'after');
+				domConstruct.place(param, tnode.rowNode, 'first');
 			}
 
 			var id = args.item.id[0];
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 5e055646c..5c854cbd8 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -19,7 +19,7 @@ require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declar
 	});
 });
 
-require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
+require(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], function (declare, domConstruct) {
 
 	return declare("fox.PrefFilterTree", lib.CheckBoxTree, {
 		_createTreeNode: function(args) {
@@ -33,14 +33,14 @@ require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
 				param = dojo.doc.createElement('span');
 				param.className = (enabled != false) ? 'labelParam' : 'labelParam filterDisabled';
 				param.innerHTML = args.item.param[0];
-				dojo.place(param, tnode.rowNode, 'first');
+				domConstruct.place(param, tnode.rowNode, 'first');
 			}
 
 			if (rules) {
 				param = dojo.doc.createElement('span');
 				param.className = 'filterRules';
 				param.innerHTML = rules;
-				dojo.place(param, tnode.rowNode, 'next');
+				domConstruct.place(param, tnode.rowNode, 'next');
 			}
 
 			if (this.model.store.getValue(args.item, 'id') != 'root') {
@@ -48,7 +48,7 @@ require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
 				img.src ='images/filter.png';
 				img.className = 'markedPic';
 				tnode._filterIconNode = img;
-				dojo.place(tnode._filterIconNode, tnode.labelNode, 'before');
+				domConstruct.place(tnode._filterIconNode, tnode.labelNode, 'before');
 			}
 
 			return tnode;
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 673fd19ad..9c43346b3 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -1,4 +1,4 @@
-require(["dojo/_base/declare", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare) {
+require(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare, domConstruct) {
 
 	return declare("fox.PrefLabelTree", lib.CheckBoxTree, {
 		setNameById: function (id, name) {
@@ -28,7 +28,7 @@ require(["dojo/_base/declare", "lib/CheckBoxTree", "dijit/form/DropDownButton"],
 
 				tnode._labelIconNode = span;
 
-				dojo.place(tnode._labelIconNode, tnode.labelNode, 'before');
+				domConstruct.place(tnode._labelIconNode, tnode.labelNode, 'before');
 			}
 
 			return tnode;
diff --git a/js/prefs.js b/js/prefs.js
index 628e66a11..69e779d45 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -919,6 +919,7 @@ function init() {
 			"dojo/ready",
 			"dojo/parser",
 			"dojo/_base/loader",
+			"dojo/_base/html",
 			"dijit/ColorPalette",
 			"dijit/Dialog",
 			"dijit/form/Button",
@@ -1811,3 +1812,4 @@ function clearSqlLog() {
 function updateSelectedPrompt() {
 	// no-op shim for toggleSelectedRow()
 }
+
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 068ad0849..e57de587e 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -222,6 +222,7 @@ function init() {
 				"dojo/ready",
 				"dojo/parser",
 				"dojo/_base/loader",
+				"dojo/_base/html",
 				"dijit/ProgressBar",
 				"dijit/ColorPalette",
 				"dijit/Dialog",