fix filter and feed dialogs breaking each other

[tt-rss.git] / js / functions.js

diff --git a/js/functions.js b/js/functions.js
index 69406f3e1100954f966de325a74c40d6b127db4f..bd0d5fb731743bdb94cd123be7d44c8ad4926031 100644 (file)
--- a/js/functions.js
+++ b/js/functions.js
@@ -1,6 +1,25 @@
 var notify_silent = false;
 var loading_progress = 0;
 var sanity_check_done = false;
+var init_params = {};
+
+Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
+       function (callOriginal, options) {
+
+               if (getInitParam("csrf_token") != undefined) {
+                       Object.extend(options, options || { });
+
+                       if (Object.isString(options.parameters))
+                               options.parameters = options.parameters.toQueryParams();
+                       else if (Object.isHash(options.parameters))
+                               options.parameters = options.parameters.toObject();
+
+                       options.parameters["csrf_token"] = getInitParam("csrf_token");
+               }
+
+               return callOriginal(options);
+       }
+);
 
 /* add method to remove element from array */
 
@@ -277,12 +296,6 @@ function gotoMain() {
        document.location.href = "index.php";
 }
 
-function gotoExportOpml(filename, settings) {
-    tmp = settings ? 1 : 0;
-       document.location.href = "opml.php?op=Export&filename=" + filename + "&settings=" + tmp;
-}
-
-
 /** * @(#)isNumeric.js * * Copyright (c) 2000 by Sundar Dorai-Raj
   * * @author Sundar Dorai-Raj
   * * Email: sdoraira@vt.edu
@@ -546,6 +559,21 @@ function fatalError(code, msg, ext_info) {
        }
 }
 
+function filterDlgCheckCat(sender) {
+       try {
+               if (sender.checked) {
+                       Element.show('filterDlg_cats');
+                       Element.hide('filterDlg_feeds');
+               } else {
+                       Element.show('filterDlg_feeds');
+                       Element.hide('filterDlg_cats');
+               }
+
+       } catch (e) {
+               exception_error("filterDlgCheckCat", e);
+       }
+}
+
 function filterDlgCheckType(sender) {
 
        try {
@@ -634,15 +662,6 @@ function explainError(code) {
        return displayDlg("explainError", code);
 }
 
-function displayHelpInfobox(topic_id) {
-
-       var url = "backend.php?op=backend&method=help&tid=" + param_escape(topic_id);
-
-       window.open(url, "ttrss_help",
-               "status=0,toolbar=0,location=0,width=450,height=500,scrollbars=1,menubar=0");
-
-}
-
 function loading_set_progress(p) {
        try {
                loading_progress += p;
@@ -950,6 +969,9 @@ function quickAddFilter() {
        try {
                var query = "backend.php?op=dlg&method=quickAddFilter";
 
+               if (dijit.byId("feedEditDlg"))
+                       dijit.byId("feedEditDlg").destroyRecursive();
+
                if (dijit.byId("filterEditDlg"))
                        dijit.byId("filterEditDlg").destroyRecursive();
 
@@ -1373,6 +1395,9 @@ function editFeed(feed, event) {
 
                console.log(query);
 
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
+
                if (dijit.byId("feedEditDlg"))
                        dijit.byId("feedEditDlg").destroyRecursive();