preferences: set themes dropdown to default if selected theme is missing

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

diff --git a/js/prefs.js b/js/prefs.js
index 34d595a7da8dda94c9742de2c45d09ed6e26df9a..23d43f366d6433ccaab7f7e5131d400411f5a2d4 100755 (executable)
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -901,10 +901,10 @@ function init_second_stage() {
                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);
@@ -919,6 +919,7 @@ function init() {
                        "dojo/ready",
                        "dojo/parser",
                        "dojo/_base/loader",
+                       "dojo/_base/html",
                        "dijit/ColorPalette",
                        "dijit/Dialog",
                        "dijit/form/Button",
@@ -943,15 +944,12 @@ function init() {
                        "dijit/Toolbar",
                        "dijit/Tree",
                        "dijit/tree/dndSource",
-                       "dojo/data/ItemFileWriteStore"], function (dojo, ready, parser) {
+                       "dojo/data/ItemFileWriteStore",
+                       "fox/PrefFeedTree",
+                       "fox/PrefFilterTree",
+                       "fox/PrefLabelTree" ], function (dojo, ready, parser) {
 
                                ready(function() {
-
-                                       dojo.require("lib.CheckBoxTree");
-                                       dojo.require("fox.PrefFeedTree");
-                                       dojo.require("fox.PrefFilterTree");
-                                       dojo.require("fox.PrefLabelTree");
-
                                        parser.parse();
 
                                        loading_set_progress(50);
@@ -1811,4 +1809,7 @@ function clearSqlLog() {
        }
 }
 
+function updateSelectedPrompt() {
+       // no-op shim for toggleSelectedRow()
+}