valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace deprecated dojo.place with domConstruct.place 

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2017-01-21 12:54:36 -05:00
parent 6a11634c93
commit 9f539be3c2
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/FeedTree.js
View File

@ -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, { return declare("fox.FeedTree", dijit.Tree, {
_onKeyPress: function(/* Event */ e) { _onKeyPress: function(/* Event */ e) {
@ -121,7 +121,7 @@ require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
color: fg_color, color: fg_color,
backgroundColor: bg_color}); backgroundColor: bg_color});
dojo.place(span, tnode.iconNode, 'replace'); domConstruct.place(span, tnode.iconNode, 'replace');
} }
if (id.match("FEED:")) { if (id.match("FEED:")) {
@ -176,7 +176,7 @@ require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
loading = dojo.doc.createElement('img'); loading = dojo.doc.createElement('img');
loading.className = 'loadingNode'; loading.className = 'loadingNode';
loading.src = 'images/blank_icon.gif'; loading.src = 'images/blank_icon.gif';
dojo.place(loading, tnode.labelNode, 'after'); domConstruct.place(loading, tnode.labelNode, 'after');
tnode.loadingNode = loading; 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"); 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.counterNode = ctr;
//tnode.labelNode.innerHTML = args.label; //tnode.labelNode.innerHTML = args.label;

6
js/PrefFeedTree.js
View File

@ -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, { return declare("fox.PrefFeedTree", lib.CheckBoxTree, {
_createTreeNode: function(args) { _createTreeNode: function(args) {
@ -32,8 +32,8 @@ require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
param = dojo.doc.createElement('span'); param = dojo.doc.createElement('span');
param.className = 'feedParam'; param.className = 'feedParam';
param.innerHTML = args.item.param[0]; param.innerHTML = args.item.param[0];
//dojo.place(param, tnode.labelNode, 'after'); //domConstruct.place(param, tnode.labelNode, 'after');
dojo.place(param, tnode.rowNode, 'first'); domConstruct.place(param, tnode.rowNode, 'first');
} }
var id = args.item.id[0]; var id = args.item.id[0];

8
js/PrefFilterTree.js
View File

@ -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, { return declare("fox.PrefFilterTree", lib.CheckBoxTree, {
_createTreeNode: function(args) { _createTreeNode: function(args) {
@ -33,14 +33,14 @@ require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
param = dojo.doc.createElement('span'); param = dojo.doc.createElement('span');
param.className = (enabled != false) ? 'labelParam' : 'labelParam filterDisabled'; param.className = (enabled != false) ? 'labelParam' : 'labelParam filterDisabled';
param.innerHTML = args.item.param[0]; param.innerHTML = args.item.param[0];
dojo.place(param, tnode.rowNode, 'first'); domConstruct.place(param, tnode.rowNode, 'first');
} }
if (rules) { if (rules) {
param = dojo.doc.createElement('span'); param = dojo.doc.createElement('span');
param.className = 'filterRules'; param.className = 'filterRules';
param.innerHTML = rules; param.innerHTML = rules;
dojo.place(param, tnode.rowNode, 'next'); domConstruct.place(param, tnode.rowNode, 'next');
} }
if (this.model.store.getValue(args.item, 'id') != 'root') { 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.src ='images/filter.png';
img.className = 'markedPic'; img.className = 'markedPic';
tnode._filterIconNode = img; tnode._filterIconNode = img;
dojo.place(tnode._filterIconNode, tnode.labelNode, 'before'); domConstruct.place(tnode._filterIconNode, tnode.labelNode, 'before');
} }
return tnode; return tnode;

4
js/PrefLabelTree.js
View File

@ -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, { return declare("fox.PrefLabelTree", lib.CheckBoxTree, {
setNameById: function (id, name) { setNameById: function (id, name) {
@ -28,7 +28,7 @@ require(["dojo/_base/declare", "lib/CheckBoxTree", "dijit/form/DropDownButton"],
tnode._labelIconNode = span; tnode._labelIconNode = span;
dojo.place(tnode._labelIconNode, tnode.labelNode, 'before'); domConstruct.place(tnode._labelIconNode, tnode.labelNode, 'before');
} }
return tnode; return tnode;

4
lib/CheckBoxTree.js
View File

@ -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, 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 = dojo.doc.createElement('input');
this._checkbox.type = 'checkbox'; this._checkbox.type = 'checkbox';
this._checkbox.attr('checked', currState); this._checkbox.attr('checked', currState);
dojo.place(this._checkbox.domNode, this.expandoNode, 'after'); domConstruct.place(this._checkbox.domNode, this.expandoNode, 'after');
} }
}, },