]> git.wh0rd.org - tt-rss.git/blobdiff - js/prefs.js
Replace all setTimeout strings with functions
[tt-rss.git] / js / prefs.js
old mode 100644 (file)
new mode 100755 (executable)
index 797e0e0..23d43f3
@@ -150,69 +150,7 @@ function editFilter(id) {
                        test: function() {
                                var query = "backend.php?" + dojo.formToQuery("filter_edit_form") + "&savemode=test";
 
-                               if (dijit.byId("filterTestDlg"))
-                                       dijit.byId("filterTestDlg").destroyRecursive();
-
-                               var test_dlg = new dijit.Dialog({
-                                       id: "filterTestDlg",
-                                       title: "Test Filter",
-                                       style: "width: 600px",
-                                       results: 0,
-                                       max_offset: 10000,
-                                       getTestResults: function(query, offset) {
-                                               var updquery = query + "&offset=" + offset;
-
-                                               console.log("getTestResults:" + offset);
-                                               //console.log(updquery);
-
-                                               new Ajax.Request("backend.php", {
-                                                       parameters: updquery,
-                                                       onComplete: function (transport) {
-
-                                                               console.log(transport.responseText);
-
-                                                               var result = JSON.parse(transport.responseText);
-
-                                                               console.log("R:" + result);
-
-                                                               //console.log("<<< " + transport.responseText);
-
-                                                               if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) {
-                                                                       test_dlg.results += result.size();
-
-                                                                       $("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d)...".replace("%d", offset));
-
-                                                                       console.log(offset + " " + test_dlg.max_offset);
-
-                                                                       for (var i = 0; i < result.size(); i++) {
-                                                                               $("prefFilterTestResultList").innerHTML += result[i];
-                                                                       }
-
-                                                                       if (test_dlg.results < 30 && offset < test_dlg.max_offset) {
-                                                                               window.setTimeout(function() {
-                                                                                       //console.log("blaargh");
-
-                                                                                       test_dlg.getTestResults(query, offset + 30);
-                                                                               }, 0);
-                                                                       } else {
-
-                                                                               // all done
-
-                                                                       }
-
-                                                               } else {
-                                                                       console.log("can't parse results object / dialog closed");
-                                                               }
-
-                                                       } });
-                                       },
-                                       href: query});
-
-                               dojo.connect(test_dlg, "onShow", null, function(e) {
-                                       test_dlg.getTestResults(query, 0);
-                               });
-
-                               test_dlg.show();
+                               editFilterTest(query);
                        },
                        selectRules: function(select) {
                                $$("#filterDlg_Matches input[type=checkbox]").each(function(e) {
@@ -951,24 +889,22 @@ function init_second_stage() {
                loading_set_progress(50);
                notify("");
 
-               dojo.addOnLoad(function() {
-                       var tab = getURLParam('tab');
+               var tab = getURLParam('tab');
 
-                       if (tab) {
-                               tab = dijit.byId(tab + "Tab");
-                               if (tab) dijit.byId("pref-tabs").selectChild(tab);
-                       }
+               if (tab) {
+                       tab = dijit.byId(tab + "Tab");
+                       if (tab) dijit.byId("pref-tabs").selectChild(tab);
+               }
 
-                       var method = getURLParam('method');
+               var method = getURLParam('method');
 
-                       if (method == 'editFeed') {
-                               var param = getURLParam('methodparam');
+               if (method == 'editFeed') {
+                       var param = getURLParam('methodparam');
 
-                               window.setTimeout('editFeed(' + param + ')', 100);
-                       }
-               });
+                       window.setTimeout(function() { editFeed(param) }, 100);
+               }
 
-               setTimeout("hotkey_prefix_timeout()", 5*1000);
+               setTimeout(hotkey_prefix_timeout, 5*1000);
 
        } catch (e) {
                exception_error("init_second_stage", e);
@@ -978,53 +914,56 @@ function init_second_stage() {
 function init() {
 
        try {
-               dojo.registerModulePath("lib", "..");
-               dojo.registerModulePath("fox", "../../js/");
-
-               dojo.require("dijit.ColorPalette");
-               dojo.require("dijit.Dialog");
-               dojo.require("dijit.form.Button");
-               dojo.require("dijit.form.CheckBox");
-               dojo.require("dijit.form.DropDownButton");
-               dojo.require("dijit.form.FilteringSelect");
-               dojo.require("dijit.form.Form");
-               dojo.require("dijit.form.RadioButton");
-               dojo.require("dijit.form.Select");
-               dojo.require("dijit.form.SimpleTextarea");
-               dojo.require("dijit.form.TextBox");
-               dojo.require("dijit.form.ValidationTextBox");
-               dojo.require("dijit.InlineEditBox");
-               dojo.require("dijit.layout.AccordionContainer");
-               dojo.require("dijit.layout.BorderContainer");
-               dojo.require("dijit.layout.ContentPane");
-               dojo.require("dijit.layout.TabContainer");
-               dojo.require("dijit.Menu");
-               dojo.require("dijit.ProgressBar");
-               dojo.require("dijit.ProgressBar");
-               dojo.require("dijit.Toolbar");
-               dojo.require("dijit.Tree");
-               dojo.require("dijit.tree.dndSource");
-               dojo.require("dojo.data.ItemFileWriteStore");
-
-               dojo.require("lib.CheckBoxTree");
-               dojo.require("fox.PrefFeedTree");
-               dojo.require("fox.PrefFilterTree");
-               dojo.require("fox.PrefLabelTree");
-
-               dojo.parser.parse();
-
-               dojo.addOnLoad(function() {
-                       loading_set_progress(50);
-
-                       var clientTzOffset = new Date().getTimezoneOffset() * 60;
 
-                       new Ajax.Request("backend.php", {
-                               parameters: {op: "rpc", method: "sanityCheck",
-                                       clientTzOffset: clientTzOffset },
-                                       onComplete: function(transport) {
-                                       backend_sanity_check_callback(transport);
-                               } });
-               });
+               require(["dojo/_base/kernel",
+                       "dojo/ready",
+                       "dojo/parser",
+                       "dojo/_base/loader",
+                       "dojo/_base/html",
+                       "dijit/ColorPalette",
+                       "dijit/Dialog",
+                       "dijit/form/Button",
+                       "dijit/form/CheckBox",
+                       "dijit/form/DropDownButton",
+                       "dijit/form/FilteringSelect",
+                       "dijit/form/Form",
+                       "dijit/form/RadioButton",
+                       "dijit/form/ComboButton",
+                       "dijit/form/Select",
+                       "dijit/form/SimpleTextarea",
+                       "dijit/form/TextBox",
+                       "dijit/form/ValidationTextBox",
+                       "dijit/InlineEditBox",
+                       "dijit/layout/AccordionContainer",
+                       "dijit/layout/AccordionPane",
+                       "dijit/layout/BorderContainer",
+                       "dijit/layout/ContentPane",
+                       "dijit/layout/TabContainer",
+                       "dijit/Menu",
+                       "dijit/ProgressBar",
+                       "dijit/Toolbar",
+                       "dijit/Tree",
+                       "dijit/tree/dndSource",
+                       "dojo/data/ItemFileWriteStore",
+                       "fox/PrefFeedTree",
+                       "fox/PrefFilterTree",
+                       "fox/PrefLabelTree" ], function (dojo, ready, parser) {
+
+                               ready(function() {
+                                       parser.parse();
+
+                                       loading_set_progress(50);
+
+                                       var clientTzOffset = new Date().getTimezoneOffset() * 60;
+
+                                       new Ajax.Request("backend.php", {
+                                               parameters: {op: "rpc", method: "sanityCheck",
+                                                       clientTzOffset: clientTzOffset },
+                                               onComplete: function(transport) {
+                                                       backend_sanity_check_callback(transport);
+                                               } });
+                               });
+                       });
 
        } catch (e) {
                exception_error("init", e);
@@ -1870,4 +1809,7 @@ function clearSqlLog() {
        }
 }
 
+function updateSelectedPrompt() {
+       // no-op shim for toggleSelectedRow()
+}