From: Anders Kaseorg Date: Sat, 21 Jan 2017 17:54:36 +0000 (-0500) Subject: Replace deprecated dojo.place with domConstruct.place X-Git-Tag: 17.1~14^2~2 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9f539be3c2c93ce358b10ca396e922b3b99b56ea;p=tt-rss.git Replace deprecated dojo.place with domConstruct.place Signed-off-by: Anders Kaseorg --- diff --git a/js/FeedTree.js b/js/FeedTree.js index dc35619e..5052f38d 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) { @@ -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; diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index c3b0d75f..c3a089d0 100644 --- a/js/PrefFeedTree.js +++ b/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]; diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index 5e055646..5c854cbd 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 673fd19a..9c43346b 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/lib/CheckBoxTree.js b/lib/CheckBoxTree.js index 1684c717..41c74ab3 100644 --- a/lib/CheckBoxTree.js +++ b/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'); } },