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

prefs: store active tab for reload, remove most old table row functions

Browse Source
This commit is contained in:
Andrew Dolgov
2018-12-02 11:25:32 +03:00
parent aa2f119eb6
commit e23b6e397d
5 changed files with 70 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
js/functions.js
View File

@@ -55,10 +55,14 @@ Array.prototype.remove = function(s) {
const Lists = {
onRowChecked: function(elem) {
const checked = elem.domNode ? elem.attr("checked") : elem.checked;
// account for dojo checkboxes
elem = elem.domNode || elem;
elem.up("li").toggleClassName("Selected");
const row = elem.up("li");
if (row)
checked ? row.addClassName("Selected") : row.removeClassName("Selected");
}
};
@@ -66,9 +70,30 @@ const Lists = {
const Tables = {
onRowChecked: function(elem) {
// account for dojo checkboxes
const checked = elem.domNode ? elem.attr("checked") : elem.checked;
elem = elem.domNode || elem;
elem.up("tr").toggleClassName("Selected");
const row = elem.up("tr");
if (row)
checked ? row.addClassName("Selected") : row.removeClassName("Selected");
},
select: function(elemId, selected) {
$(elemId).select("tr").each((row) => {
const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0];
if (checkNode) {
const widget = dijit.getEnclosingWidget(checkNode);
if (widget) {
widget.attr("checked", selected);
} else {
checkNode.checked = selected;
}
this.onRowChecked(widget);
}
});
},
getSelected: function(elemId) {
const rv = [];
@@ -1532,60 +1557,6 @@ function uploadFeedIcon() {
return false;
}
// mode = all, none, invert
function selectTableRows(id, mode) {
const rows = $(id).rows;
for (let i = 0; i < rows.length; i++) {
const row = rows[i];
let cb = false;
let dcb = false;
if (row.id && row.className) {
const bare_id = row.id.replace(/^[A-Z]*?-/, "");
const inputs = rows[i].getElementsByTagName("input");
for (let j = 0; j < inputs.length; j++) {
const input = inputs[j];
if (input.getAttribute("type") == "checkbox" &&
input.id.match(bare_id)) {
cb = input;
dcb = dijit.getEnclosingWidget(cb);
break;
}
}
if (cb || dcb) {
const issel = row.hasClassName("Selected");
if (mode == "all" && !issel) {
row.addClassName("Selected");
cb.checked = true;
if (dcb) dcb.set("checked", true);
} else if (mode == "none" && issel) {
row.removeClassName("Selected");
cb.checked = false;
if (dcb) dcb.set("checked", false);
} else if (mode == "invert") {
if (issel) {
row.removeClassName("Selected");
cb.checked = false;
if (dcb) dcb.set("checked", false);
} else {
row.addClassName("Selected");
cb.checked = true;
if (dcb) dcb.set("checked", true);
}
}
}
}
}
}
// noinspection JSUnusedGlobalSymbols
function label_to_feed_id(label) {
return _label_base_index - 1 - Math.abs(label);

39
js/prefs.js
View File

@@ -73,18 +73,34 @@ const App = {
if (tab) {
tab = dijit.byId(tab + "Tab");
if (tab) dijit.byId("pref-tabs").selectChild(tab);
if (tab) {
dijit.byId("pref-tabs").selectChild(tab);
switch (Utils.urlParam('method')) {
case "editfeed":
window.setTimeout(function () {
CommonDialogs.editFeed(Utils.urlParam('methodparam'))
}, 100);
break;
default:
console.warn("initSecondStage, unknown method:", Utils.urlParam("method"));
}
}
} else {
let tab = localStorage.getItem("ttrss:prefs-tab");
if (tab) {
tab = dijit.byId(tab);
if (tab) {
dijit.byId("pref-tabs").selectChild(tab);
}
}
}
const method = Utils.urlParam('method');
dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) {
localStorage.setItem("ttrss:prefs-tab", elem.id);
});
if (method == 'editFeed') {
const param = Utils.urlParam('methodparam');
window.setTimeout(function () {
CommonDialogs.editFeed(param)
}, 100);
}
},
hotkeyHandler: function (event) {
if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
@@ -725,8 +741,8 @@ function updateSystemList() {
});
}
function selectTab(id, noupdate) {
if (!noupdate) {
function selectTab(id, selectOnly) {
if (!selectOnly) {
notify_progress("Loading, please wait...");
switch (id) {
@@ -754,7 +770,6 @@ function selectTab(id, noupdate) {
const tab = dijit.byId(id + "Tab");
dijit.byId("pref-tabs").selectChild(tab);
}
}