]> git.wh0rd.org - tt-rss.git/blobdiff - functions.js
better feed url checking
[tt-rss.git] / functions.js
index 527a6f81701eafff3a36dc29e97748139185316a..4f1f37553f497d04661035f7d75768169443c556 100644 (file)
@@ -1,6 +1,6 @@
 var hotkeys_enabled = true;
 var notify_silent = false;
-var last_progress_point = 0;
+var loading_progress = 0;
 var sanity_check_done = false;
 
 /* add method to remove element from array */
@@ -466,20 +466,15 @@ function infobox_callback2(transport) {
                var content;
                var dtitle = "Dialog";
 
-               if (transport.responseXML) {
-                       var dlg = transport.responseXML.getElementsByTagName("dlg")[0];
-
-                       var title = transport.responseXML.getElementsByTagName("title")[0];
-                       if (title)
-                               title = title.firstChild.nodeValue;
+               var dlg = transport.responseXML.getElementsByTagName("dlg")[0];
 
-                       var content = transport.responseXML.getElementsByTagName("content")[0];
-                       
-                       content = content.firstChild.nodeValue;
+               var title = transport.responseXML.getElementsByTagName("title")[0];
+               if (title)
+                       title = title.firstChild.nodeValue;
 
-               } else {
-                       content = transport.responseText;
-               }
+               var content = transport.responseXML.getElementsByTagName("content")[0];
+               
+               content = content.firstChild.nodeValue;
 
                if (!dialog) {
                        dialog = new dijit.Dialog({
@@ -741,26 +736,15 @@ function filterDlgCheckType(sender) {
 
        try {
 
-               var ftype = sender[sender.selectedIndex].value;
-
-               var form = document.forms["filter_add_form"];
-       
-               if (!form) {
-                       form = document.forms["filter_edit_form"];
-               }
-
-               if (!form) {
-                       console.log("filterDlgCheckType: can't find form!");
-                       return;
-               }
+               var ftype = sender.value;
 
                // if selected filter type is 5 (Date) enable the modifier dropbox
                if (ftype == 5) {
-                       Element.show("filter_dlg_date_mod_box");
-                       Element.show("filter_dlg_date_chk_box");
+                       Element.show("filterDlg_dateModBox");
+                       Element.show("filterDlg_dateChkBox");
                } else {
-                       Element.hide("filter_dlg_date_mod_box");
-                       Element.hide("filter_dlg_date_chk_box");
+                       Element.hide("filterDlg_dateModBox");
+                       Element.hide("filterDlg_dateChkBox");
 
                }
 
@@ -774,20 +758,9 @@ function filterDlgCheckAction(sender) {
 
        try {
 
-               var action = sender[sender.selectedIndex].value;
+               var action = sender.value;
 
-               var form = document.forms["filter_add_form"];
-       
-               if (!form) {
-                       form = document.forms["filter_edit_form"];
-               }
-
-               if (!form) {
-                       console.log("filterDlgCheckAction: can't find form!");
-                       return;
-               }
-
-               var action_param = $("filter_dlg_param_box");
+               var action_param = $("filterDlg_paramBox");
 
                if (!action_param) {
                        console.log("filterDlgCheckAction: can't find action param box!");
@@ -796,13 +769,13 @@ function filterDlgCheckAction(sender) {
 
                // if selected action supports parameters, enable params field
                if (action == 4 || action == 6 || action == 7) {
-                       Element.show(action_param);
+                       new Effect.Appear(action_param, {duration : 0.5});
                        if (action != 7) {
-                               Element.show(form.action_param);
-                               Element.hide(form.action_param_label);
+                               Element.show(dijit.byId("filterDlg_actionParam").domNode);
+                               Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
                        } else {
-                               Element.show(form.action_param_label);
-                               Element.hide(form.action_param);
+                               Element.show(dijit.byId("filterDlg_actionParamLabel").domNode);
+                               Element.hide(dijit.byId("filterDlg_actionParam").domNode);
                        }
                } else {
                        Element.hide(action_param);
@@ -816,18 +789,9 @@ function filterDlgCheckAction(sender) {
 
 function filterDlgCheckDate() {
        try {
-               var form = document.forms["filter_add_form"];
-       
-               if (!form) {
-                       form = document.forms["filter_edit_form"];
-               }
+               var dialog = dijit.byId("filterEditDlg");
 
-               if (!form) {
-                       console.log("filterDlgCheckAction: can't find form!");
-                       return;
-               }
-
-               var reg_exp = form.reg_exp.value;
+               var reg_exp = dialog.attr('value').reg_exp;
 
                var query = "?op=rpc&subop=checkDate&date=" + reg_exp;
 
@@ -835,26 +799,18 @@ function filterDlgCheckDate() {
                        parameters: query,
                        onComplete: function(transport) { 
 
-                               var form = document.forms["filter_add_form"];
-       
-                               if (!form) {
-                                       form = document.forms["filter_edit_form"];
-                               }
-
                                if (transport.responseXML) {
                                        var result = transport.responseXML.getElementsByTagName("result")[0];
 
                                        if (result && result.firstChild) {
                                                if (result.firstChild.nodeValue == "1") {
-
-                                                       new Effect.Highlight(form.reg_exp, {startcolor : '#00ff00'});
-
+                                                       alert(__("Date syntax appears to be correct."));
                                                        return;
                                                }
                                        }
                                }
 
-                               new Effect.Highlight(form.reg_exp, {startcolor : '#ff0000'});
+                               alert(__("Date syntax is incorrect."));
 
                        } });
 
@@ -879,21 +835,13 @@ function displayHelpInfobox(topic_id) {
 
 function loading_set_progress(p) {
        try {
-               if (p < last_progress_point || !Element.visible("overlay")) return;
-
-               console.log("loading_set_progress : " + p + " (" + last_progress_point + ")");
-
-               var o = $("l_progress_i");
-
-//             o.style.width = (p * 2) + "px";
+               loading_progress += p;
 
-               new Effect.Scale(o, p, { 
-                       scaleY : false,
-                       scaleFrom : last_progress_point,
-                       scaleMode: { originalWidth : 200 },
-                       queue: { position: 'end', scope: 'LSP-Q', limit: 3 } }); 
+               if (dijit.byId("loading_bar"))
+                       dijit.byId("loading_bar").update({progress: loading_progress});
 
-               last_progress_point = p;
+               if (loading_progress >= 90)
+                       remove_splash();
 
        } catch (e) {
                exception_error("loading_set_progress", e);
@@ -901,6 +849,7 @@ function loading_set_progress(p) {
 }
 
 function remove_splash() {
+
        if (Element.visible("overlay")) {
                console.log("about to remove splash, OMG!");
                Element.hide("overlay");
@@ -1218,8 +1167,63 @@ function quickAddFeed() {
 }
 
 function quickAddFilter() {
-       displayDlg('quickAddFilter', '',
-          function () {document.forms['filter_add_form'].reg_exp.focus();});
+       try {
+               var query = "backend.php?op=dlg&id=quickAddFilter";
+
+               if (dijit.byId("filterEditDlg"))
+                       dijit.byId("filterEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "filterEditDlg",
+                       title: __("Create Filter"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+
+                                       var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + 
+                                               param_escape(dialog.attr('value').reg_exp);
+
+                                       notify_progress("Verifying regular expression...");
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: query,
+                                               onComplete: function(transport) {
+                                                       handle_rpc_reply(transport);
+                                                       var response = transport.responseXML;
+
+                                                       if (response) {
+                                                               var s = response.getElementsByTagName("status")[0].firstChild.nodeValue;
+       
+                                                               notify('');
+
+                                                               if (s == "INVALID") {
+                                                                       alert("Match regular expression seems to be invalid.");
+                                                                       return;
+                                                               } else {
+                                                                       notify_progress("Saving data...", true);
+
+                                                                       console.log(dojo.objectToQuery(dialog.attr('value')));
+
+                                                                       new Ajax.Request("backend.php", {
+                                                                               parameters: dojo.objectToQuery(dialog.attr('value')),
+                                                                               onComplete: function(transport) {
+                                                                                       dialog.hide();
+                                                                                       notify_info(transport.responseText);
+                                                                                       if (inPreferences()) {
+                                                                                               updateFilterList();                             
+                                                                                       }
+                                                                       }})
+                                                               }       
+                                                       }
+                                       }});
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+       } catch (e) {
+               exception_error("quickAddFilter", e);
+       }
 }
 
 function unsubscribeFeed(feed_id, title) {
@@ -1321,7 +1325,7 @@ function has_local_storage() {
 
 function catSelectOnChange(elem) {
        try {
-               var value = elem[elem.selectedIndex].value;
+/*             var value = elem[elem.selectedIndex].value;
                var def = elem.getAttribute('default');
 
                if (value == "ADD_CAT") {
@@ -1332,7 +1336,7 @@ function catSelectOnChange(elem) {
                                elem.selectedIndex = 0;
 
                        quickAddCat(elem);
-               }
+               } */
 
        } catch (e) {
                exception_error("catSelectOnChange", e);
@@ -1415,7 +1419,7 @@ function genUrlChangeKey(feed, is_cat) {
 
 function labelSelectOnChange(elem) {
        try {
-               var value = elem[elem.selectedIndex].value;
+/*             var value = elem[elem.selectedIndex].value;
                var def = elem.getAttribute('default');
 
                if (value == "ADD_LABEL") {
@@ -1440,7 +1444,7 @@ function labelSelectOnChange(elem) {
                                                exception_error("addLabel", e);
                                        }
                        });
-               }
+               } */
 
        } catch (e) {
                exception_error("labelSelectOnChange", e);
@@ -1554,3 +1558,49 @@ function getSelectedTableRowIds(id) {
        return rows;
 }
 
+function editFeed(feed, event) {
+       try {
+               if (feed <= 0)
+                       return alert(__("You can't edit this kind of feed."));
+
+               var query = "backend.php?op=pref-feeds&subop=editfeed&id=" +
+                       param_escape(feed);
+
+               console.log(query);
+
+               if (dijit.byId("feedEditDlg"))
+                       dijit.byId("feedEditDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "feedEditDlg",
+                       title: __("Edit Feed"),
+                       style: "width: 600px",
+                       execute: function() {
+                               if (this.validate()) {
+                                       console.log(dojo.objectToQuery(this.attr('value')));
+
+                                       notify_progress("Saving data...", true);
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: dojo.objectToQuery(dialog.attr('value')),
+                                               onComplete: function(transport) {
+                                                       dialog.hide();
+                                                       if (inPreferences()) {
+                                                               updateFeedList();
+                                                       } else {
+                                                               notify('');
+                                                               dlg_frefresh_callback(transport);
+                                                       }
+                                       }})
+                               }
+                       },
+                       href: query});
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("editFeed", e);
+       }
+}
+
+