public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 13:25:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dojo-1.12.1'

Browse Source 
Conflicts:
	js/prefs.js
This commit is contained in:
Andrew Dolgov
2017-01-21 21:59:17 +03:00
parent ab235fc5f1 1c4f5e8390
commit e2e2479984
1202 changed files with 4065 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
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, {
_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;
}
}

14
js/PrefFeedTree.js
View File

@@ -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];

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, {
_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;

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, {
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
js/prefs.js
View File

@@ -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()
}

1
js/tt-rss.js
View File

@@ -222,6 +222,7 @@ function init() {
"dojo/ready",
"dojo/parser",
"dojo/_base/loader",
"dojo/_base/html",
"dijit/ProgressBar",
"dijit/ColorPalette",
"dijit/Dialog",