Author: nbelaevski Date: 2009-03-20 13:02:34 -0400 (Fri, 20 Mar 2009) New Revision: 13065 Modified: trunk/framework/impl/generatescript.xml trunk/framework/impl/src/main/javascript/jquery/jquery-1.3.2.js Log: https://jira.jboss.org/jira/browse/RF-6465 Modified: trunk/framework/impl/generatescript.xml =================================================================== --- trunk/framework/impl/generatescript.xml 2009-03-20 16:48:46 UTC (rev 13064) +++ trunk/framework/impl/generatescript.xml 2009-03-20 17:02:34 UTC (rev 13065) @@ -50,7 +50,7 @@ --> <filelist id="jquery" dir="${basedir}/src/main/javascript/jquery" - files="jquery-1.3.2.js,noConflict.js,../memory.js,patches.js"> + files="jquery-1.3.2.js,../memory.js,patches.js"> </filelist> <filelist id="scriptaculous" Modified: trunk/framework/impl/src/main/javascript/jquery/jquery-1.3.2.js =================================================================== --- trunk/framework/impl/src/main/javascript/jquery/jquery-1.3.2.js 2009-03-20 16:48:46 UTC (rev 13064) +++ trunk/framework/impl/src/main/javascript/jquery/jquery-1.3.2.js 2009-03-20 17:02:34 UTC (rev 13065) @@ -21,7 +21,7 @@ // Map over the $ in case of overwrite _$ = window.$, - jQuery = window.jQuery = window.$ = function( selector, context ) { + jQuery = window.jQuery = window.j$ = function( selector, context ) { // RF: added for RichFaces components if (arguments[0] == arguments.callee) { return arguments.callee;