]> git.wh0rd.org - tt-rss.git/blobdiff - js/prefs.js
remove ok = confirm() thing
[tt-rss.git] / js / prefs.js
index 1358b940412b56baff866f0fcb165dc144dead01..965e12fa6ee42fb35a5b2be79e2f0793bba7a823 100755 (executable)
@@ -248,10 +248,7 @@ function removeSelectedLabels() {
        const sel_rows = getSelectedLabels();
 
        if (sel_rows.length > 0) {
-
-               const ok = confirm(__("Remove selected labels?"));
-
-               if (ok) {
+               if (confirm(__("Remove selected labels?"))) {
                        notify_progress("Removing selected labels...");
 
                        const query = { op: "pref-labels", method: "remove",
@@ -274,9 +271,7 @@ function removeSelectedUsers() {
 
        if (sel_rows.length > 0) {
 
-               const ok = confirm(__("Remove selected users? Neither default admin nor your account will be removed."));
-
-               if (ok) {
+               if (confirm(__("Remove selected users? Neither default admin nor your account will be removed."))) {
                        notify_progress("Removing selected users...");
 
                        const query = { op: "pref-users", method: "remove",
@@ -299,10 +294,7 @@ function removeSelectedFilters() {
        const sel_rows = getSelectedFilters();
 
        if (sel_rows.length > 0) {
-
-               const ok = confirm(__("Remove selected filters?"));
-
-               if (ok) {
+               if (confirm(__("Remove selected filters?"))) {
                        notify_progress("Removing selected filters...");
 
                        const query = { op: "pref-filters", method: "remove",
@@ -324,10 +316,7 @@ function removeSelectedFeeds() {
        const sel_rows = getSelectedFeeds();
 
        if (sel_rows.length > 0) {
-
-               const ok = confirm(__("Unsubscribe from selected feeds?"));
-
-               if (ok) {
+               if (confirm(__("Unsubscribe from selected feeds?"))) {
 
                        notify_progress("Unsubscribing from selected feeds...", true);
 
@@ -378,9 +367,7 @@ function resetSelectedUserPass() {
                return;
        }
 
-       const ok = confirm(__("Reset password of selected user?"));
-
-       if (ok) {
+       if (confirm(__("Reset password of selected user?"))) {
                notify_progress("Resetting password for selected user...");
 
                const id = rows[0];
@@ -452,9 +439,7 @@ function joinSelectedFilters() {
                return;
        }
 
-       const ok = confirm(__("Combine selected filters?"));
-
-       if (ok) {
+       if (confirm(__("Combine selected filters?"))) {
                notify_progress("Joining filters...");
 
                xhrPost("backend.php", { op: "pref-filters", method: "join", ids: rows.toString() }, () => {
@@ -734,16 +719,12 @@ function init() {
                                loading_set_progress(50);
 
                                const clientTzOffset = new Date().getTimezoneOffset() * 60;
+                               const params = { op: "rpc", method: "sanityCheck", clientTzOffset: clientTzOffset };
 
-                               new Ajax.Request("backend.php", {
-                                       parameters: {
-                                               op: "rpc", method: "sanityCheck",
-                                               clientTzOffset: clientTzOffset
-                                       },
-                                       onComplete: function (transport) {
-                                               backend_sanity_check_callback(transport);
-                                       }
+                               xhrPost("backend.php", params, (transport) => {
+                                       backend_sanity_check_callback(transport);
                                });
+
                        } catch (e) {
                                exception_error(e);
                        }
@@ -793,44 +774,32 @@ function pref_hotkey_handler(e) {
 
 function removeCategory(id, item) {
 
-       const ok = confirm(__("Remove category %s? Any nested feeds would be placed into Uncategorized.").replace("%s", item.name));
-
-       if (ok) {
-               const query = "?op=pref-feeds&method=removeCat&ids=" +
-                       param_escape(id);
-
+       if (confirm(__("Remove category %s? Any nested feeds would be placed into Uncategorized.").replace("%s", item.name))) {
                notify_progress("Removing category...");
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function (transport) {
-                               notify('');
-                               updateFeedList();
-                       }
-               });
+        const query = { op: "pref-feeds", method: "removeCat",
+            ids: id };
+
+               xhrPost("backend.php", query, () => {
+            notify('');
+            updateFeedList();
+        });
        }
 }
 
 function removeSelectedCategories() {
-
        const sel_rows = getSelectedCategories();
 
        if (sel_rows.length > 0) {
-
-               const ok = confirm(__("Remove selected categories?"));
-
-               if (ok) {
+               if (confirm(__("Remove selected categories?"))) {
                        notify_progress("Removing selected categories...");
 
-                       const query = "?op=pref-feeds&method=removeCat&ids="+
-                               param_escape(sel_rows.toString());
-
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                               updateFeedList();
-                                       } });
+                       const query = { op: "pref-feeds", method: "removeCat",
+                               ids: sel_rows.toString() };
 
+                       xhrPost("backend.php", query, () => {
+                updateFeedList();
+            });
                }
        } else {
                alert(__("No categories are selected."));
@@ -843,19 +812,12 @@ function createCategory() {
        const title = prompt(__("Category title:"));
 
        if (title) {
-
                notify_progress("Creating category...");
 
-               const query = "?op=pref-feeds&method=addCat&cat=" +
-                       param_escape(title);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function (transport) {
-                               notify('');
-                               updateFeedList();
-                       }
-               });
+               xhrPost("backend.php", { op: "pref-feeds", method: "addCat", cat: title }, () => {
+            notify('');
+            updateFeedList();
+        });
        }
 }
 
@@ -875,25 +837,18 @@ function showInactiveFeeds() {
                removeSelected: function () {
                        const sel_rows = this.getSelectedFeeds();
 
-                       console.log(sel_rows);
-
                        if (sel_rows.length > 0) {
-                               const ok = confirm(__("Remove selected feeds?"));
-
-                               if (ok) {
+                               if (confirm(__("Remove selected feeds?"))) {
                                        notify_progress("Removing selected feeds...", true);
 
-                                       const query = "?op=pref-feeds&method=remove&ids=" +
-                                               param_escape(sel_rows.toString());
+                                       const query = { op: "pref-feeds", method: "remove",
+                                               ids: sel_rows.toString() };
 
-                                       new Ajax.Request("backend.php", {
-                                               parameters: query,
-                                               onComplete: function (transport) {
-                                                       notify('');
-                                                       dialog.hide();
-                                                       updateFeedList();
-                                               }
-                                       });
+                                       xhrPost("backend.php", query, () => {
+                        notify('');
+                        dialog.hide();
+                        updateFeedList();
+                    });
                                }
 
                        } else {
@@ -911,36 +866,27 @@ function showInactiveFeeds() {
 }
 
 function opmlRegenKey() {
-       const ok = confirm(__("Replace current OPML publishing address with a new one?"));
-
-       if (ok) {
-
+       if (confirm(__("Replace current OPML publishing address with a new one?"))) {
                notify_progress("Trying to change address...", true);
 
-               const query = "?op=pref-feeds&method=regenOPMLKey";
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function (transport) {
-                               const reply = JSON.parse(transport.responseText);
-
-                               const new_link = reply.link;
+               xhrJson("backend.php", { op: "pref-feeds", method: "regenOPMLKey" }, (reply) => {
+            if (reply) {
+                const new_link = reply.link;
+                const e = $('pub_opml_url');
 
-                               const e = $('pub_opml_url');
+                if (new_link) {
+                    e.href = new_link;
+                    e.innerHTML = new_link;
 
-                               if (new_link) {
-                                       e.href = new_link;
-                                       e.innerHTML = new_link;
+                    new Effect.Highlight(e);
 
-                                       new Effect.Highlight(e);
+                    notify('');
 
-                                       notify('');
-
-                               } else {
-                                       notify_error("Could not change feed URL.");
-                               }
-                       }
-               });
+                } else {
+                    notify_error("Could not change feed URL.");
+                }
+            }
+        });
        }
        return false;
 }
@@ -949,18 +895,14 @@ function labelColorReset() {
        const labels = getSelectedLabels();
 
        if (labels.length > 0) {
-               const ok = confirm(__("Reset selected labels to default colors?"));
+               if (confirm(__("Reset selected labels to default colors?"))) {
 
-               if (ok) {
-                       const query = "?op=pref-labels&method=colorreset&ids=" +
-                               param_escape(labels.toString());
+                       const query = { op: "pref-labels", method: "colorreset",
+                               ids: labels.toString() };
 
-                       new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function (transport) {
-                                       updateLabelList();
-                               }
-                       });
+                       xhrPost("backend.php", query, () => {
+                updateLabelList();
+            });
                }
 
        } else {
@@ -990,9 +932,7 @@ function editProfiles() {
                        const sel_rows = this.getSelectedProfiles();
 
                        if (sel_rows.length > 0) {
-                               const ok = confirm(__("Remove selected profiles? Active and default profiles will not be removed."));
-
-                               if (ok) {
+                               if (confirm(__("Remove selected profiles? Active and default profiles will not be removed."))) {
                                        notify_progress("Removing selected profiles...", true);
 
                                        const query = { op: "rpc", method: "remprofiles",
@@ -1012,10 +952,7 @@ function editProfiles() {
                        const sel_rows = this.getSelectedProfiles();
 
                        if (sel_rows.length == 1) {
-
-                               const ok = confirm(__("Activate selected profile?"));
-
-                               if (ok) {
+                               if (confirm(__("Activate selected profile?"))) {
                                        notify_progress("Loading, please wait...");
 
                     xhrPost("backend.php", { op: "rpc", method: "setprofile", id: sel_rows.toString() },  () => {
@@ -1076,9 +1013,7 @@ function activatePrefProfile() {
 
 function clearFeedAccessKeys() {
 
-       const ok = confirm(__("This will invalidate all previously generated feed URLs. Continue?"));
-
-       if (ok) {
+       if (confirm(__("This will invalidate all previously generated feed URLs. Continue?"))) {
                notify_progress("Clearing URLs...");
 
                xhrPost("backend.php", { op: "pref-feeds", method: "clearKeys" }, () => {