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

move some label helper functions to prefLabelTree

This commit is contained in:
Andrew Dolgov 2018-12-02 11:34:57 +03:00
parent e23b6e397d
commit 2e985d1733
3 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/pref/labels.php
View File

@ -278,10 +278,10 @@ class Pref_Labels extends Handler_Protected {
print"<button dojoType=\"dijit.form.Button\" onclick=\"return addLabel()\">". print"<button dojoType=\"dijit.form.Button\" onclick=\"return addLabel()\">".
__('Create label')."</button dojoType=\"dijit.form.Button\"> "; __('Create label')."</button dojoType=\"dijit.form.Button\"> ";
print "<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedLabels()\">". print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
__('Remove')."</button dojoType=\"dijit.form.Button\"> "; __('Remove')."</button dojoType=\"dijit.form.Button\"> ";
print "<button dojoType=\"dijit.form.Button\" onclick=\"labelColorReset()\">". print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').resetColors()\">".
__('Clear colors')."</button dojoType=\"dijit.form.Button\">"; __('Clear colors')."</button dojoType=\"dijit.form.Button\">";

55
js/PrefLabelTree.js
View File

@ -37,7 +37,60 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
getIconClass: function (item, opened) { getIconClass: function (item, opened) {
return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible"; return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
}, },
}); getSelectedLabels: function() {
const tree = dijit.byId("labelTree");
const items = tree.model.getCheckedItems();
const rv = [];
items.each(function(item) {
rv.push(tree.model.store.getValue(item, 'bare_id'));
});
return rv;
},
resetColors: function() {
const labels = this.getSelectedLabels();
if (labels.length > 0) {
if (confirm(__("Reset selected labels to default colors?"))) {
const query = {
op: "pref-labels", method: "colorreset",
ids: labels.toString()
};
xhrPost("backend.php", query, () => {
updateLabelList();
});
}
} else {
alert(__("No labels are selected."));
}
},
removeSelected: function() {
const sel_rows = this.getSelectedLabels();
if (sel_rows.length > 0) {
if (confirm(__("Remove selected labels?"))) {
notify_progress("Removing selected labels...");
const query = {
op: "pref-labels", method: "remove",
ids: sel_rows.toString()
};
xhrPost("backend.php", query, () => {
updateLabelList();
});
}
} else {
alert(__("No labels are selected."));
}
return false;
}
});
}); });

54
js/prefs.js
View File

@ -316,19 +316,6 @@ function editFilter(id) {
dialog.show(); dialog.show();
} }
function getSelectedLabels() {
const tree = dijit.byId("labelTree");
const items = tree.model.getCheckedItems();
const rv = [];
items.each(function(item) {
rv.push(tree.model.store.getValue(item, 'bare_id'));
});
return rv;
}
function getSelectedUsers() { function getSelectedUsers() {
return Tables.getSelected("prefUserList"); return Tables.getSelected("prefUserList");
} }
@ -372,28 +359,6 @@ function getSelectedFilters() {
} }
function removeSelectedLabels() {
const sel_rows = getSelectedLabels();
if (sel_rows.length > 0) {
if (confirm(__("Remove selected labels?"))) {
notify_progress("Removing selected labels...");
const query = { op: "pref-labels", method: "remove",
ids: sel_rows.toString() };
xhrPost("backend.php", query, () => {
updateLabelList();
});
}
} else {
alert(__("No labels are selected."));
}
return false;
}
function removeSelectedUsers() { function removeSelectedUsers() {
const sel_rows = getSelectedUsers(); const sel_rows = getSelectedUsers();
@ -906,25 +871,6 @@ function opmlRegenKey() {
return false; return false;
} }
function labelColorReset() {
const labels = getSelectedLabels();
if (labels.length > 0) {
if (confirm(__("Reset selected labels to default colors?"))) {
const query = { op: "pref-labels", method: "colorreset",
ids: labels.toString() };
xhrPost("backend.php", query, () => {
updateLabelList();
});
}
} else {
alert(__("No labels are selected."));
}
}
function editProfiles() { function editProfiles() {
if (dijit.byId("profileEditDlg")) if (dijit.byId("profileEditDlg"))