diff options
author | Andrew Dolgov <[email protected]> | 2011-01-18 17:04:29 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-01-18 17:04:29 +0300 |
commit | b01b1b38f3b4ec3d60213b3f62e29deeb6c29534 (patch) | |
tree | 6be1197eb9f7326ee8ae74b4bdd668421f04c6df | |
parent | 33d32a3c7ce98dc96e36a387640ff23017ac287a (diff) |
fix edit subscription option button doing nothing after external subscription
-rw-r--r-- | prefs.js | 30 |
1 files changed, 8 insertions, 22 deletions
@@ -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); |