--- Webpacus/root/js/webpac.js 2005/11/26 16:22:02 159 +++ Webpacus/root/js/webpac.js 2005/11/26 16:37:04 161 @@ -19,6 +19,7 @@ $('template_name').value = template_name; submit_results_form(); + return false; } /* @@ -26,7 +27,17 @@ */ function load_results_page(page_nr) { - var old_page = current_page_nr(); + if (parseInt(page_nr) != page_nr) { + Logger.error("load_results_page can't parseInt "+page_nr); + return false; + } + + var old_page = get_page_nr(); + + if (page_nr < 1) { + Logger.error("load_results_page called with '"+page_nr+"' < 1"); + return false; + } Logger.info('load_results_page: '+page_nr+' (from page: '+old_page+')'); @@ -37,19 +48,28 @@ $('page_nr').value = page_nr; submit_results_form(); + + return false; } -function current_page_nr() { +function get_page_nr() { var page_nr = parseInt( $('page_nr').value ) || 0; return page_nr; } +/* syntaxtic sugar */ +function set_page_nr(nr) { + return load_results_page(nr); +} + function next_page() { - load_results_page( current_page_nr() + 1 ); + load_results_page( get_page_nr() + 1 ); + return false; } function prev_page() { - load_results_page( current_page_nr() - 1 ); + load_results_page( get_page_nr() - 1 ); + return false; } /* @@ -59,10 +79,12 @@ var results_form = $('results_form'); if (results_form) { - Logger.debug('Ajax.Updater(results,/results)'); + var form_params = Form.serialize( results_form ); + + Logger.debug('Ajax.Updater(results,/results) '+form_params); new Ajax.Updater( 'results', '/search/results', { - parameters: Form.serialize( results_form ), + parameters: form_params, asynchronous: 1, onLoading: function(request) { show_searching(); @@ -76,6 +98,7 @@ Logger.debug('no results_form element'); return undef; } + return false; } /* @@ -85,6 +108,7 @@ Logger.debug('show_searching'); Element.show('searching'); new Effect.Fade('results', { duration: 0.3 }); + return false; } function hide_searching() { @@ -92,5 +116,6 @@ Element.hide('searching'); //new Effect.Highlight('results'); new Effect.Appear('results', { duration: 0.3 }); + return false; }