valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix edit subscription option button doing nothing after external subscription

This commit is contained in:
Andrew Dolgov 2011-01-18 17:04:29 +03:00
parent 33d32a3c7c
commit b01b1b38f3
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
prefs.js
View File

@ -1,29 +1,15 @@
var init_params = new Array(); var init_params = new Array();
var caller_subop = false;
var hotkey_prefix = false; var hotkey_prefix = false;
var hotkey_prefix_pressed = false; var hotkey_prefix_pressed = false;
var seq = ""; var seq = "";
function feedlist_callback2(transport) { function feedlist_callback2(transport) {
try { try {
dijit.byId('feedConfigTab').attr('content', transport.responseText); dijit.byId('feedConfigTab').attr('content', transport.responseText);
selectTab("feedConfig", true); 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(""); notify("");
} catch (e) { } catch (e) {
exception_error("feedlist_callback2", e); exception_error("feedlist_callback2", e);
} }
@ -869,15 +855,7 @@ function init_second_stage() {
try { try {
document.onkeydown = pref_hotkey_handler; document.onkeydown = pref_hotkey_handler;
caller_subop = getURLParam('subop');
if (getURLParam("subopparam")) {
caller_subop = caller_subop + ":" + getURLParam("subopparam");
}
loading_set_progress(50); loading_set_progress(50);
notify(""); notify("");
dojo.addOnLoad(function() { dojo.addOnLoad(function() {
@ -887,6 +865,14 @@ function init_second_stage() {
tab = dijit.byId(tab + "Tab"); tab = dijit.byId(tab + "Tab");
if (tab) dijit.byId("pref-tabs").selectChild(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); setTimeout("hotkey_prefix_timeout()", 5*1000);