diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/functions.js | 9 | ||||
-rw-r--r-- | js/prefs.js | 20 | ||||
-rw-r--r-- | js/tt-rss.js | 8 |
3 files changed, 20 insertions, 17 deletions
diff --git a/js/functions.js b/js/functions.js index 69406f3e1..02134aafa 100644 --- a/js/functions.js +++ b/js/functions.js @@ -634,15 +634,6 @@ function explainError(code) { return displayDlg("explainError", code); } -function displayHelpInfobox(topic_id) { - - var url = "backend.php?op=backend&method=help&tid=" + param_escape(topic_id); - - window.open(url, "ttrss_help", - "status=0,toolbar=0,location=0,width=450,height=500,scrollbars=1,menubar=0"); - -} - function loading_set_progress(p) { try { loading_progress += p; diff --git a/js/prefs.js b/js/prefs.js index 896a787c6..bd3866991 100644 --- a/js/prefs.js +++ b/js/prefs.js @@ -1001,12 +1001,7 @@ function pref_hotkey_handler(e) { if (!hotkey_prefix) { if ((keycode == 191 || keychar == '?') && shift_key) { // ? - if (!Element.visible("hotkey_help_overlay")) { - //Element.show("hotkey_help_overlay"); - Effect.Appear("hotkey_help_overlay", {duration : 0.3, to: 0.9}); - } else { - Element.hide("hotkey_help_overlay"); - } + showHelp(); return false; } @@ -1919,3 +1914,16 @@ function editSelectedInstance() { editInstance(rows[0]); } +function showHelp() { + try { + new Ajax.Request("backend.php", { + parameters: "?op=backend&method=help&topic=prefs", + onComplete: function(transport) { + $("hotkey_help_overlay").innerHTML = transport.responseText; + Effect.Appear("hotkey_help_overlay", {duration : 0.3}); + } }); + + } catch (e) { + exception_error("showHelp", e); + } +} diff --git a/js/tt-rss.js b/js/tt-rss.js index 38232bdfe..23349db63 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -428,8 +428,12 @@ function quickMenuGo(opid) { } if (opid == "qmcHKhelp") { - //Element.show("hotkey_help_overlay"); - Effect.Appear("hotkey_help_overlay", {duration : 0.3}); + new Ajax.Request("backend.php", { + parameters: "?op=backend&method=help&topic=main", + onComplete: function(transport) { + $("hotkey_help_overlay").innerHTML = transport.responseText; + Effect.Appear("hotkey_help_overlay", {duration : 0.3}); + } }); } if (opid == "qmcAbout") { |