diff options
| -rw-r--r-- | backend.php | 9 | ||||
| -rw-r--r-- | functions.js | 3 | ||||
| -rw-r--r-- | prefs.js | 5 | ||||
| -rw-r--r-- | prefs.php | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/backend.php b/backend.php index 31c1215f6..1daf49aa0 100644 --- a/backend.php +++ b/backend.php @@ -1823,7 +1823,7 @@ if (db_num_rows($result) != 0) { - print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>"; +// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>"; print "<p><table width=\"100%\" cellspacing=\"0\" class=\"prefFeedList\" id=\"prefFeedList\">"; @@ -2159,8 +2159,7 @@ if ($quiet) return; - print "<div id=\"infoBoxShadow\"> - <div id=\"infoBox\">PLACEHOLDER</div></div>"; +// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>"; $result = db_query($link, "SELECT id,description FROM ttrss_filter_types ORDER BY description"); @@ -2472,7 +2471,7 @@ owner_uid = ".$_SESSION["uid"]." ORDER by description"); - print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>"; +// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>"; if (db_num_rows($result) != 0) { @@ -3379,7 +3378,7 @@ ttrss_users ORDER by login"); - print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>"; +// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>"; print "<p><table width=\"100%\" cellspacing=\"0\" class=\"prefUserList\" id=\"prefUserList\">"; diff --git a/functions.js b/functions.js index fda1ff4e4..e09846893 100644 --- a/functions.js +++ b/functions.js @@ -80,6 +80,8 @@ function delay(gap) { var notify_hide_timerid = false; var notify_last_doc = false; +var notify_effect = false; + function hide_notify() { if (notify_last_doc) { var n = notify_last_doc.getElementById("notify"); @@ -1028,6 +1030,5 @@ function qafAdd() { xmlhttp.open("GET", "backend.php?" + query, true); xmlhttp.onreadystatechange=dlg_frefresh_callback; xmlhttp.send(null); - } @@ -634,6 +634,8 @@ function feedEditSave() { xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xmlhttp.send(query); + closeInfoBox(); + return false; } catch (e) { @@ -1130,6 +1132,9 @@ function selectTab(id, noupdate) { notify("Loading, please wait...", true); + // close active infobox if needed + closeInfoBox(); + // clean up all current selections, just in case active_feed_cat = false; active_filter = false; @@ -48,6 +48,8 @@ <script type="text/javascript" src="functions.js?<?= $dt_add ?>"></script> <script type="text/javascript" src="prefs.js?<?= $dt_add ?>"></script> + <div id="infoBoxShadow"><div id="infoBox">BAH</div></div> + <!--[if gte IE 5.5000]> <script type="text/javascript" src="pngfix.js"></script> <link rel="stylesheet" type="text/css" href="tt-rss-ie.css"> |