--- Webpacus/root/js/search.js 2006/01/07 18:26:58 353 +++ Webpacus/root/js/search.js 2006/01/07 22:45:11 354 @@ -110,16 +110,39 @@ if (results_form) { var form_params = Form.serialize( results_form ); - Logger.debug('Ajax.Updater(results,/results/ajax) '+form_params); + var results_div = 'results'; + var page_nr = get_page_nr() || 0; + if (page_nr > 1) { + results_div += '_' + page_nr; + } + + if (! $( results_div )) { + Logger.error('next page div '+results_div+' doesn\'t exist'); + results_div = 'results'; + } + + var i_nr = 0; + + var t = 'searching_'+page_nr; + if ( $(t) ) { + i_nr = page_nr; + Logger.debug('indicator div '+t+' found, using indicator nr: '+i_nr); + } else { + Logger.debug('can\'t find indicator div '+t); + } - new Ajax.Updater( 'results', '/search/results/ajax', { + Logger.debug('submit_results_form page:'+page_nr+' div:'+results_div+' '+form_params); + + new Ajax.Updater( results_div, '/search/results/ajax', { parameters: form_params, asynchronous: 1, onLoading: function(request) { - show_searching(); + Logger.info( 'loading page '+page_nr+' into '+progress_div ); + show_searching( page_nr ); }, onLoaded: function(request) { - hide_searching(); + Logger.info( 'page '+page_nr+' loaded into '+progress_div ); + hide_searching( page_nr ); } } ) ; return false; @@ -136,20 +159,24 @@ var search_active = 0; -function show_searching() { - Logger.debug('show_searching'); - Element.show('searching'); -// new Effect.Fade('results', { duration: 0.3 }); +function show_searching( page_nr ) { + Logger.debug('show_searching '+page_nr); + var el = 'searching'; + if (page_nr && page_nr > 1) el += '_'+page_nr; + Element.show( el ); search_active = 1; return false; } -function hide_searching() { - Logger.debug('hide_searching'); - Element.hide('searching'); -// new Effect.Highlight('results'); -// new Effect.Appear('results', { duration: 0.3 }); +function hide_searching( page_nr ) { + Logger.debug('hide_searching '+page_nr); + var el = 'searching'; + if (page_nr && page_nr > 1) { + Element.hide('page_'+(page_nr - 1)); + } + Element.hide( el ); search_active = 0; +// new Effect.Appear('results', { duration: 0.3 }); return false; }