Browse Source

Replace deprecated dojo.place with domConstruct.place

Signed-off-by: Anders Kaseorg <[email protected]>
Anders Kaseorg 3 years ago
parent
commit
9f539be3c2
5 changed files with 15 additions and 15 deletions
  1. 4 4
      js/FeedTree.js
  2. 3 3
      js/PrefFeedTree.js
  3. 4 4
      js/PrefFilterTree.js
  4. 2 2
      js/PrefLabelTree.js
  5. 2 2
      lib/CheckBoxTree.js

+ 4 - 4
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) {
@@ -121,7 +121,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, 'replace');
 			}
 
 			if (id.match("FEED:")) {
@@ -176,7 +176,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 +204,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;

+ 3 - 3
js/PrefFeedTree.js

@@ -17,7 +17,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.PrefFeedTree", lib.CheckBoxTree, {
 		_createTreeNode: function(args) {
@@ -32,8 +32,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];

+ 4 - 4
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;

+ 2 - 2
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;

+ 2 - 2
lib/CheckBoxTree.js

@@ -338,7 +338,7 @@ require(["dojo/_base/declare", "dijit/tree/TreeStoreModel"], function (declare)
 
 });
 
-require(["dojo/_base/declare", "dijit/Tree"], function (declare) {
+require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree"], function (declare, domConstruct) {
 
 	return declare("lib._CheckBoxTreeNode", dijit._TreeNode,
 		{
@@ -363,7 +363,7 @@ require(["dojo/_base/declare", "dijit/Tree"], function (declare) {
 					//this._checkbox = dojo.doc.createElement('input');
 					this._checkbox.type = 'checkbox';
 					this._checkbox.attr('checked', currState);
-					dojo.place(this._checkbox.domNode, this.expandoNode, 'after');
+					domConstruct.place(this._checkbox.domNode, this.expandoNode, 'after');
 				}
 			},