fix edit subscription option button doing nothing after external subscription

diff --git a/prefs.js b/prefs.js
index c88ae2c06965c8a7dbc2de4d1aad8e538e058bb8..93f5b06c77d25b8fa27f1d6593b69883ac1fbf30 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -1,29 +1,15 @@
 var init_params = new Array();
 
-var caller_subop = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 
 var seq = "";
 
 function feedlist_callback2(transport) {
-
        try {   
-
                dijit.byId('feedConfigTab').attr('content', transport.responseText); 
-
                selectTab("feedConfig", true);
-
-               if (caller_subop) {
-                       var tuple = caller_subop.split(":");
-                       if (tuple[0] == 'editFeed') {
-                               window.setTimeout('editFeed('+tuple[1]+')', 100);
-                       }                               
-
-                       caller_subop = false;
-               }
                notify("");
-
        } catch (e) {
                exception_error("feedlist_callback2", e);
        }
@@ -869,15 +855,7 @@ function init_second_stage() {
        try {
 
                document.onkeydown = pref_hotkey_handler;
-
-               caller_subop = getURLParam('subop');
-
-               if (getURLParam("subopparam")) {
-                       caller_subop = caller_subop + ":" + getURLParam("subopparam");
-               }
-
                loading_set_progress(50);
-
                notify("");
 
                dojo.addOnLoad(function() {
@@ -887,6 +865,14 @@ function init_second_stage() {
                                tab = dijit.byId(tab + "Tab");
                                if (tab) dijit.byId("pref-tabs").selectChild(tab);
                        }
+
+                       var subop = getURLParam('subop');
+
+                       if (subop == 'editFeed') {
+                               var param = getURLParam('subopparam');
+
+                               window.setTimeout('editFeed(' + param + ')', 100);
+                       }
                });
 
                setTimeout("hotkey_prefix_timeout()", 5*1000);