Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js =================================================================== diff -u -r6903 -r6904 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 6903) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 6904) @@ -580,14 +580,27 @@ submit_event($prefix_special, 'OnSearchReset', null, null, $ajax); } -function search_keydown($event) +function search_keydown($event, $prefix_special, $grid, $ajax) { $event = $event ? $event : event; - if ($event.keyCode == 13) { - var $prefix_special = this.getAttribute('PrefixSpecial'); - var $grid = this.getAttribute('Grid'); - search($prefix_special, $grid, parseInt(this.getAttribute('ajax'))); + + if (window.event) {// IE + var $key_code = $event.keyCode; } + else if($event.which) { // Netscape/Firefox/Opera + var $key_code = $event.which; + } + + switch ($key_code) { + case 13: + search($prefix_special, $grid, parseInt($ajax)); + break; + + case 27: + search_reset($prefix_special, $grid, parseInt($ajax)); + break; + + } } function getRealLeft(el)