mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-08-06 22:27:42 +02:00
Code Issues Projects Releases Wiki Activity

switch modules to new dojo definition format

Browse Source
This commit is contained in:
Andrew Dolgov 2016-08-10 13:40:24 +03:00
parent 546b419f52
commit d39a2f8005
7 changed files with 1151 additions and 1134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/FeedTree.js
View File

@ -1,10 +1,6 @@
dojo.provide("fox.FeedTree");
dojo.provide("fox.FeedStoreModel");
require(["dojo/_base/declare", "dijit/tree/ForestStoreModel"], function (declare) {
dojo.require("dijit.Tree");
dojo.require("dijit.Menu");
dojo.declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
return declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
getItemsInCategory: function (id) {
if (!this.store._itemsByIdentity) return undefined;
@ -95,9 +91,13 @@ dojo.declare("fox.FeedStoreModel", dijit.tree.ForestStoreModel, {
else
return false;
},
});
});
dojo.declare("fox.FeedTree", dijit.Tree, {
require(["dojo/_base/declare", "dijit/Tree", "dijit/Menu"], function (declare) {
return declare("fox.FeedTree", dijit.Tree, {
_onKeyPress: function(/* Event */ e) {
return; // Stop dijit.Tree from interpreting keystrokes
},
@ -587,3 +587,5 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
}
},
});
});

15
js/PrefFeedTree.js
View File

@ -1,10 +1,6 @@
dojo.provide("fox.PrefFeedTree");
dojo.provide("fox.PrefFeedStore");
require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
dojo.require("lib.CheckBoxTree");
dojo.require("dojo.data.ItemFileWriteStore");
dojo.declare("fox.PrefFeedStore", dojo.data.ItemFileWriteStore, {
return declare("fox.PrefFeedStore", dojo.data.ItemFileWriteStore, {
_saveEverything: function(saveCompleteCallback, saveFailedCallback,
newFileContentString) {
@ -19,7 +15,11 @@ dojo.declare("fox.PrefFeedStore", dojo.data.ItemFileWriteStore, {
});
dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
});
require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
return declare("fox.PrefFeedTree", lib.CheckBoxTree, {
_createTreeNode: function(args) {
var tnode = this.inherited(arguments);
@ -122,4 +122,5 @@ dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
}
},
});
});

24
js/PrefFilterTree.js
View File

@ -1,24 +1,27 @@
dojo.provide("fox.PrefFilterTree");
require(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
dojo.require("lib.CheckBoxTree");
dojo.require("dojo.data.ItemFileWriteStore");
dojo.declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
return declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
_saveEverything: function (saveCompleteCallback, saveFailedCallback,
newFileContentString) {
dojo.xhrPost({
url: "backend.php",
content: {op: "pref-filters", method: "savefilterorder",
payload: newFileContentString},
content: {
op: "pref-filters", method: "savefilterorder",
payload: newFileContentString
},
error: saveFailedCallback,
load: saveCompleteCallback});
load: saveCompleteCallback
});
},
});
});
dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
require(["dojo/_base/declare", "lib/CheckBoxTree"], function (declare) {
return declare("fox.PrefFilterTree", lib.CheckBoxTree, {
_createTreeNode: function(args) {
var tnode = this.inherited(arguments);
@ -94,3 +97,6 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
},
});
});

10
js/PrefLabelTree.js
View File

@ -1,9 +1,6 @@
dojo.provide("fox.PrefLabelTree");
require(["dojo/_base/declare", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare) {
dojo.require("lib.CheckBoxTree");
dojo.require("dijit.form.DropDownButton");
dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
return declare("fox.PrefLabelTree", lib.CheckBoxTree, {
setNameById: function (id, name) {
var item = this.model.store._itemsByIdentity['LABEL:' + id];
@ -41,3 +38,6 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
},
});
});

11
js/prefs.js
View File

@ -943,15 +943,12 @@ function init() {
"dijit/Toolbar",
"dijit/Tree",
"dijit/tree/dndSource",
"dojo/data/ItemFileWriteStore"], function (dojo, ready, parser) {
"dojo/data/ItemFileWriteStore",
"fox/PrefFeedTree",
"fox/PrefFilterTree",
"fox/PrefLabelTree" ], function (dojo, ready, parser) {
ready(function() {
dojo.require("lib.CheckBoxTree");
dojo.require("fox.PrefFeedTree");
dojo.require("fox.PrefFilterTree");
dojo.require("fox.PrefLabelTree");
parser.parse();
loading_set_progress(50);

5
js/tt-rss.js
View File

@ -248,12 +248,11 @@ function init() {
"dijit/Tree",
"dijit/tree/dndSource",
"dijit/tree/ForestStoreModel",
"dojo/data/ItemFileWriteStore" ], function (dojo, ready, parser) {
"dojo/data/ItemFileWriteStore",
"fox/FeedTree" ], function (dojo, ready, parser) {
ready(function() {
dojo.require("fox.FeedTree");
parser.parse();
if (!genericSanityCheck())

26
lib/CheckBoxTree.js
View File

@ -1,15 +1,17 @@
dojo.provide("lib.CheckBoxTree");
dojo.provide("lib.CheckBoxStoreModel");
//dojo.provide("lib.CheckBoxTree");
//dojo.provide("lib.CheckBoxStoreModel");
// THIS WIDGET IS BASED ON DOJO/DIJIT 1.4.0 AND WILL NOT WORK WITH PREVIOUS VERSIONS
//
// Release date: 02/05/2010
//
dojo.require("dijit.Tree");
dojo.require("dijit.form.CheckBox");
//dojo.require("dijit.Tree");
//dojo.require("dijit.form.CheckBox");
dojo.declare( "lib.CheckBoxStoreModel", dijit.tree.TreeStoreModel,
require(["dojo/_base/declare", "dijit/tree/TreeStoreModel"], function (declare) {
return declare( "lib.CheckBoxStoreModel", dijit.tree.TreeStoreModel,
{
// checkboxAll: Boolean
// If true, every node in the tree will receive a checkbox regardless if the 'checkbox' attribute
@ -334,7 +336,11 @@ dojo.declare( "lib.CheckBoxStoreModel", dijit.tree.TreeStoreModel,
});
dojo.declare( "lib._CheckBoxTreeNode", dijit._TreeNode,
});
require(["dojo/_base/declare", "dijit/Tree"], function (declare) {
return declare("lib._CheckBoxTreeNode", dijit._TreeNode,
{
// _checkbox: [protected] dojo.doc.element
// Local reference to the dojo.doc.element of type 'checkbox'
@ -371,8 +377,11 @@ dojo.declare( "lib._CheckBoxTreeNode", dijit._TreeNode,
}
});
});
dojo.declare( "lib.CheckBoxTree", dijit.Tree,
require(["dojo/_base/declare", "dijit/Tree"], function (declare) {
return declare( "lib.CheckBoxTree", dijit.Tree,
{
onNodeChecked: function(/*dojo.data.Item*/ storeItem, /*treeNode*/ treeNode) {
@ -472,3 +481,6 @@ dojo.declare( "lib.CheckBoxTree", dijit.Tree,
}
});
});