Index: branches/RC/core/admin_templates/js/script.js =================================================================== diff -u -N -r11546 -r11576 --- branches/RC/core/admin_templates/js/script.js (.../script.js) (revision 11546) +++ branches/RC/core/admin_templates/js/script.js (.../script.js) (revision 11576) @@ -709,11 +709,8 @@ // sets hidden field value // if the field does not exist - creates it -function setInnerHTML($field_id, $value) -{ - var $element = document.getElementById($field_id); - if (!$element) return false; - $element.innerHTML = $value; +function setInnerHTML($field_id, $value) { + $( jq('#' + $field_id) ).html($value); } function get_hidden_field($field) @@ -738,13 +735,24 @@ function search_keydown($event, $prefix_special, $grid, $ajax) { - $event = $event ? $event : event; + if ($prefix_special !== undefined) { + // if $prefix_special is passed, then keydown event was not assigned by jQuery + $event = $event ? $event : event; - if (window.event) {// IE - var $key_code = $event.keyCode; + if (window.event) {// IE + var $key_code = $event.keyCode; + } + else if($event.which) { // Netscape/Firefox/Opera + var $key_code = $event.which; + } } - else if($event.which) { // Netscape/Firefox/Opera + else { + // event bind with jQuery, so always use which var $key_code = $event.which; + + $prefix_special = $(this).attr('PrefixSpecial'); + $grid = $(this).attr('Grid'); + $ajax = $(this).attr('ajax'); } switch ($key_code) { @@ -1534,11 +1542,14 @@ } function findPos(obj, with_scroll) { + /*var $offset = $(obj).offset(); + + return [$offset.left, $offset.top];*/ + if (!with_scroll) var with_scroll = false; var curleft = curtop = 0; if (obj.offsetParent) { - // could raise "Unspecified error" in IE curleft = obj.offsetLeft - (with_scroll ? obj.scrollLeft : 0) curtop = obj.offsetTop - (with_scroll ? obj.scrollTop : 0) while (obj = obj.offsetParent) {