diff --git a/js/App.js b/js/App.js
index 2041a6168..68f3740c5 100644
--- a/js/App.js
+++ b/js/App.js
@@ -358,6 +358,27 @@ const App = {
return p;
}
},
+ // http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
+ getSelectedText: function() {
+ let text = "";
+
+ if (typeof window.getSelection != "undefined") {
+ const sel = window.getSelection();
+ if (sel.rangeCount) {
+ const container = document.createElement("div");
+ for (let i = 0, len = sel.rangeCount; i < len; ++i) {
+ container.appendChild(sel.getRangeAt(i).cloneContents());
+ }
+ text = container.innerHTML;
+ }
+ } else if (typeof document.selection != "undefined") {
+ if (document.selection.type == "Text") {
+ text = document.selection.createRange().textText;
+ }
+ }
+
+ return text.stripTags();
+ },
displayIfChecked: function(checkbox, elemId) {
if (checkbox.checked) {
Element.show(elemId);
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 210c63479..88f9c83f5 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -19,342 +19,332 @@ const Filters = {
query = {op: "pref-filters", method: "edit", id: id};
}
- xhr.post("backend.php", query, function (reply) {
- try {
- const dialog = new fox.SingleUseDialog({
- id: "filterEditDlg",
- title: id ? __("Edit Filter") : __("Create Filter"),
- test: function() {
- const test_dialog = new fox.SingleUseDialog({
- title: "Test Filter",
- results: 0,
- limit: 100,
- max_offset: 10000,
- getTestResults: function (params, offset) {
- params.method = 'testFilterDo';
- params.offset = offset;
- params.limit = test_dialog.limit;
+ const dialog = new fox.SingleUseDialog({
+ id: "filterEditDlg",
+ title: id ? __("Edit Filter") : __("Create Filter"),
+ test: function() {
+ const test_dialog = new fox.SingleUseDialog({
+ title: "Test Filter",
+ results: 0,
+ limit: 100,
+ max_offset: 10000,
+ getTestResults: function (params, offset) {
+ params.method = 'testFilterDo';
+ params.offset = offset;
+ params.limit = test_dialog.limit;
- console.log("getTestResults:" + offset);
+ console.log("getTestResults:" + offset);
- xhr.json("backend.php", params, (result) => {
- try {
- if (result && test_dialog && test_dialog.open) {
- test_dialog.results += result.length;
+ xhr.json("backend.php", params, (result) => {
+ try {
+ if (result && test_dialog && test_dialog.open) {
+ test_dialog.results += result.length;
- console.log("got results:" + result.length);
+ console.log("got results:" + result.length);
- App.byId("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
- .replace("%f", test_dialog.results)
- .replace("%d", offset);
+ App.byId("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
+ .replace("%f", test_dialog.results)
+ .replace("%d", offset);
- console.log(offset + " " + test_dialog.max_offset);
+ console.log(offset + " " + test_dialog.max_offset);
- for (let i = 0; i < result.length; i++) {
- const tmp = dojo.create("table", { innerHTML: result[i]});
+ for (let i = 0; i < result.length; i++) {
+ const tmp = dojo.create("table", { innerHTML: result[i]});
- App.byId("prefFilterTestResultList").innerHTML += tmp.innerHTML;
- }
-
- if (test_dialog.results < 30 && offset < test_dialog.max_offset) {
-
- // get the next batch
- window.setTimeout(function () {
- test_dialog.getTestResults(params, offset + test_dialog.limit);
- }, 0);
-
- } else {
- // all done
-
- Element.hide("prefFilterLoadingIndicator");
-
- if (test_dialog.results == 0) {
- App.byId("prefFilterTestResultList").innerHTML = `|
- ${__('No recent articles matching this filter have been found.')} |
`;
- App.byId("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
- } else {
- App.byId("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
- .replace("%d", test_dialog.results);
- }
-
- }
-
- } else if (!result) {
- console.log("getTestResults: can't parse results object");
- Element.hide("prefFilterLoadingIndicator");
- Notify.error("Error while trying to get filter test results.");
- } else {
- console.log("getTestResults: dialog closed, bailing out.");
- }
- } catch (e) {
- App.Error.report(e);
+ App.byId("prefFilterTestResultList").innerHTML += tmp.innerHTML;
}
- });
- },
- content: `
-
-
-
Looking for articles...
-
|
+ ${__('No recent articles matching this filter have been found.')} |
`;
+ App.byId("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
+ } else {
+ App.byId("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
+ .replace("%d", test_dialog.results);
+ }
+
}
+ } else if (!result) {
+ console.log("getTestResults: can't parse results object");
+ Element.hide("prefFilterLoadingIndicator");
+ Notify.error("Error while trying to get filter test results.");
} else {
- Element.hide(action_param);
- }
- },
-
- execute: function () {
- if (this.validate()) {
- dialog.createNewActionElement(App.byId("filterDlg_Actions"), replaceNode);
- this.hide();
+ console.log("getTestResults: dialog closed, bailing out.");
}
+ } catch (e) {
+ App.Error.report(e);
}
});
-
- const tmph = dojo.connect(edit_action_dialog, "onShow", null, function (/* e */) {
- dojo.disconnect(tmph);
-
- xhr.post("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (reply) => {
- edit_action_dialog.attr('content', reply);
- });
- });
-
- edit_action_dialog.show();
},
- selectRules: function (select) {
- Lists.select("filterDlg_Matches", select);
- },
- selectActions: function (select) {
- Lists.select("filterDlg_Actions", select);
- },
- onRuleClicked: function (e) {
- const li = e.closest('li');
- const rule = li.querySelector('input[name="rule[]"]').value
+ content: `
+
+
+
Looking for articles...
+