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

Add callback to Popups, focus subscribe URL input.

This commit is contained in:
Adrian Lang 2010-01-06 12:17:28 +01:00 committed by Andrew Dolgov
parent ae096313ed
commit 542aebacb7
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
functions.js
View File

@ -1313,7 +1313,7 @@ function closeInfoBox(cleanup) {
} }
function displayDlg(id, param) { function displayDlg(id, param, callback) {
notify_progress("Loading, please wait...", true); notify_progress("Loading, please wait...", true);
@ -1326,6 +1326,7 @@ function displayDlg(id, param) {
parameters: query, parameters: query,
onComplete: function (transport) { onComplete: function (transport) {
infobox_callback2(transport); infobox_callback2(transport);
if (callback) callback(transport);
} }); } });
return false; 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(); disableHotkeys();
notify(""); notify("");

2
modules/popup-dialog.php
View File

@ -101,7 +101,7 @@
print "<input size=\"40\" print "<input size=\"40\"
onkeypress=\"return filterCR(event, subscribeToFeed)\" onkeypress=\"return filterCR(event, subscribeToFeed)\"
name=\"feed_url\"></td></tr>"; name=\"feed_url\" id=\"feed_url\"></td></tr>";
print "<br/>"; print "<br/>";

3
tt-rss.js
View File

@ -581,7 +581,8 @@ function quickMenuGo(opid) {
} }
if (opid == "qmcAddFeed") { if (opid == "qmcAddFeed") {
displayDlg("quickAddFeed"); displayDlg('quickAddFeed', '',
function () {$('feed_url').focus();});
return; return;
} }

7
viewfeed.js
View File

@ -1468,7 +1468,12 @@ function catchupSelection() {
} }
function editArticleTags(id, feed_id, cdm_enabled) { 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" });
});
} }