diff options
author | Adrian Lang <[email protected]> | 2010-01-06 12:17:28 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-01-13 11:46:11 +0300 |
commit | 542aebacb73d9fe571048d01d9ffc12d4bca1643 (patch) | |
tree | 05cef8d04e2bb6d1c09f49991fdb68e500cf87a2 | |
parent | ae096313ed2a5fc4b96dc82a5203f23936cd23f8 (diff) |
Add callback to Popups, focus subscribe URL input.
-rw-r--r-- | functions.js | 11 | ||||
-rw-r--r-- | modules/popup-dialog.php | 2 | ||||
-rw-r--r-- | tt-rss.js | 3 | ||||
-rw-r--r-- | viewfeed.js | 7 |
4 files changed, 11 insertions, 12 deletions
diff --git a/functions.js b/functions.js index 1e167c94f..a5d803c9f 100644 --- a/functions.js +++ b/functions.js @@ -1313,7 +1313,7 @@ function closeInfoBox(cleanup) { } -function displayDlg(id, param) { +function displayDlg(id, param, callback) { notify_progress("Loading, please wait...", true); @@ -1326,6 +1326,7 @@ function displayDlg(id, param) { parameters: query, onComplete: function (transport) { infobox_callback2(transport); + if (callback) callback(transport); } }); return false; @@ -1366,14 +1367,6 @@ function infobox_callback2(transport) { } - /* FIXME this needs to be moved out somewhere */ - - if ($("tags_choices")) { - new Ajax.Autocompleter('tags_str', 'tags_choices', - "backend.php?op=rpc&subop=completeTags", - { tokens: ',', paramName: "search" }); - } - disableHotkeys(); notify(""); diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index e75d8a9ad..a035cfe91 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -101,7 +101,7 @@ print "<input size=\"40\" onkeypress=\"return filterCR(event, subscribeToFeed)\" - name=\"feed_url\"></td></tr>"; + name=\"feed_url\" id=\"feed_url\"></td></tr>"; print "<br/>"; @@ -581,7 +581,8 @@ function quickMenuGo(opid) { } if (opid == "qmcAddFeed") { - displayDlg("quickAddFeed"); + displayDlg('quickAddFeed', '', + function () {$('feed_url').focus();}); return; } diff --git a/viewfeed.js b/viewfeed.js index ad7e14553..d2425d99c 100644 --- a/viewfeed.js +++ b/viewfeed.js @@ -1468,7 +1468,12 @@ function catchupSelection() { } function editArticleTags(id, feed_id, cdm_enabled) { - displayDlg('editArticleTags', id); + displayDlg('editArticleTags', id, + function () { + new Ajax.Autocompleter('tags_str', 'tags_choices', + "backend.php?op=rpc&subop=completeTags", + { tokens: ',', paramName: "search" }); + }); } |