Author: nbelaevski Date: 2008-06-26 20:31:08 -0400 (Thu, 26 Jun 2008) New Revision: 9262 Modified: trunk/framework/impl/generatescript.xml trunk/framework/impl/src/main/javascript/jquery/jquery-1.2.6.js Log: 1. Patch for jQuery's event.fix() applied 2. jQuery switched to 1.2.6 in scripts generation Modified: trunk/framework/impl/generatescript.xml =================================================================== --- trunk/framework/impl/generatescript.xml 2008-06-27 00:06:35 UTC (rev 9261) +++ trunk/framework/impl/generatescript.xml 2008-06-27 00:31:08 UTC (rev 9262) @@ -50,7 +50,7 @@ --> <filelist id="jquery" dir="${basedir}/src/main/javascript/jquery" - files="jquery-1.2.3.js,noConflict.js,../memory.js,patches.js"> + files="jquery-1.2.6.js,noConflict.js,../memory.js,patches.js"> </filelist> <filelist id="scriptaculous" Modified: trunk/framework/impl/src/main/javascript/jquery/jquery-1.2.6.js =================================================================== --- trunk/framework/impl/src/main/javascript/jquery/jquery-1.2.6.js 2008-06-27 00:06:35 UTC (rev 9261) +++ trunk/framework/impl/src/main/javascript/jquery/jquery-1.2.6.js 2008-06-27 00:31:08 UTC (rev 9262) @@ -2101,8 +2101,9 @@ var originalEvent = event; event = { originalEvent: originalEvent }; var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" "); - for ( var i=props.length; i; i-- ) - event[ props[i] ] = originalEvent[ props[i] ]; + //applied patch: http://dev.jquery.com/ticket/2947 + for ( var i=props.length-1; i>=0; i-- ) + event[ props[i] ] = originalEvent[ props[i] ]; // Mark it as fixed event[expando] = true;