diff --git a/inc/html.php b/inc/html.php index 08e46fe24996ead5652bc29ccadbbdbb410ad83a..1a0963afa602eacd10a0484ce1ed772b53e16d9c 100644 --- a/inc/html.php +++ b/inc/html.php @@ -368,15 +368,6 @@ function html_search(){ $intro ); echo $intro; - flush(); - - //show progressbar - print '<div id="dw__loading">'.NL; - print '<script type="text/javascript">/*<![CDATA[*/'.NL; - print 'showLoadBar();'.NL; - print '/*!]]>*/</script>'.NL; - print '</div>'.NL; - flush(); //do quick pagesearch $data = ft_pageLookup($QUERY,true,useHeading('navigation')); @@ -404,7 +395,6 @@ function html_search(){ print '<div class="clearer"></div>'; print '</div>'; } - flush(); //do fulltext search $regex = array(); @@ -425,18 +415,11 @@ function html_search(){ } $num++; } - flush(); } print '</dl>'; }else{ print '<div class="nothing">'.$lang['nothingfound'].'</div>'; } - - //hide progressbar - print '<script type="text/javascript">/*<![CDATA[*/'.NL; - print 'hideLoadBar("dw__loading");'.NL; - print '/*!]]>*/</script>'.NL; - flush(); } /** diff --git a/lib/images/loading.gif b/lib/images/loading.gif deleted file mode 100644 index 35058e20f0fa29fb426d56dc31cfb36fa2af417d..0000000000000000000000000000000000000000 Binary files a/lib/images/loading.gif and /dev/null differ diff --git a/lib/scripts/script.js b/lib/scripts/script.js index 5fddb0431de209770ab0ef3900065f51cf18629c..97edef0b7c64d95ad6794c74abd6f2b212de17a0 100644 --- a/lib/scripts/script.js +++ b/lib/scripts/script.js @@ -18,39 +18,6 @@ if (clientPC.indexOf('opera')!=-1) { var is_opera_seven = (window.opera && document.childNodes); } -/** - * Prints a animated gif to show the search is performed - * - * Because we need to modify the DOM here before the document is loaded - * and parsed completely we have to rely on document.write() - * - * @author Andreas Gohr <andi@splitbrain.org> - */ -function showLoadBar(){ - - document.write('<img src="'+DOKU_BASE+'lib/images/loading.gif" '+ - 'width="150" height="12" alt="..." />'); - - /* this does not work reliable in IE - obj = $(id); - - if(obj){ - obj.innerHTML = '<img src="'+DOKU_BASE+'lib/images/loading.gif" '+ - 'width="150" height="12" alt="..." />'; - obj.style.display="block"; - } - */ -} - -/** - * Disables the animated gif to show the search is done - * - * @author Andreas Gohr <andi@splitbrain.org> - */ -function hideLoadBar(id){ - jQuery('#' + id).hide(); -} - /** * Handler to close all open Popups */