closeInfoBox: properly cleanup contents

diff --git a/functions.js b/functions.js
index 5ce714b5d6dd905a9f9a7460924c7b90ec9f3c7c..56b7909d4d4825555609acc84d6e5d6c189b38c9 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1266,7 +1266,7 @@ function closeInfoBox(cleanup) {
                        Element.hide("dialog_overlay");
                        Element.hide("infoBoxShadow");
 
-                       if (cleanup) $("infoBoxShadow").innerHTML = " ";
+                       if (cleanup) $("infoBox").innerHTML = " ";
                }
        } catch (e) {
                exception_error("closeInfoBox", e);

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index b55799ba32bc7ebd55a3ab52cbc0dd250b1f9f37..e61329820b42153c5c9c85db6c4cf07c856abaf0 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -426,7 +426,7 @@
 
                        print "<div class=\"dlgButtons\">
                        <button onclick=\"javascript:search()\">".__('Search')."</button>
-                       <button onclick=\"javascript:searchCancel()\">".__('Cancel')."</button>
+                       <button onclick=\"javascript:closeInfoBox(true)\">".__('Cancel')."</button>
                        </div>";
 
                        print "</div>";

diff --git a/tt-rss.js b/tt-rss.js
index 05fefea3a530b58426d35ad875916d61ec06165c..d93ea260a53d0cf19dd303822c42dc8215df793a 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -315,10 +315,6 @@ function resetSearch() {
        }
 }
 
-function searchCancel() {
-       closeInfoBox(true);
-}
-
 function search() {
        closeInfoBox(); 
        viewCurrentFeed(0, "");