Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed bug #147, required some (ugly) modifications: changed function …

…jQuery(...){} to jQuery = function(...){}, necessary because IE parses all function name(){} declarations before executing inline code; added intro.js and outro.js to both build.xml (tested) and Makefile (not tested) to include "if(typeof window.jQuery == "undefined") { ... }
  • Loading branch information...
commit 770a92a594a803486a66603a67f559ff15915d8b 1 parent ea53a61
@jzaefferer jzaefferer authored
View
4 Makefile
@@ -6,10 +6,12 @@ DOCS_DIR = ${PREFIX}/docs
TEST_DIR = ${PREFIX}/test
DIST_DIR = ${PREFIX}/dist
-MODULES = ${SRC_DIR}/jquery/*\
+MODULES = ${SRC_DIR}/intro.js\
+ ${SRC_DIR}/jquery/*\
${SRC_DIR}/event/*\
${SRC_DIR}/fx/*\
${SRC_DIR}/ajax/*
+ ${SRC_DIR}/outro.js\
JQ = ${DIST_DIR}/jquery.js
JQ_LITE = ${DIST_DIR}/jquery.lite.js
View
6 build.xml
@@ -17,11 +17,13 @@
<target name="jquery">
<echo message="Building ${JQ}" />
<mkdir dir="${DIST_DIR}" />
- <concat destfile="${JQ}">
+ <concat destfile="${JQ}">
+ <fileset dir="${SRC_DIR}" includes="intro.js" />
<fileset dir="${SRC_DIR}" includes="jquery/*.js" />
<fileset dir="${SRC_DIR}" includes="event/*.js" />
<fileset dir="${SRC_DIR}" includes="fx/*.js" />
- <fileset dir="${SRC_DIR}" includes="ajax/*.js" />
+ <fileset dir="${SRC_DIR}" includes="ajax/*.js" />
+ <fileset dir="${SRC_DIR}" includes="outro.js" />
</concat>
<echo message="${JQ} built." />
</target>
View
2  src/intro.js
@@ -0,0 +1,2 @@
+/* prevent execution of jQuery if included more then once */
+if(typeof window.jQuery == "undefined") {
View
4 src/jquery/jquery.js
@@ -28,7 +28,7 @@ window.undefined = window.undefined;
* @name jQuery
* @cat Core
*/
-function jQuery(a,c) {
+jQuery = function(a,c) {
// Shortcut for document ready (because $(document).each() is silly)
if ( a && a.constructor == Function && jQuery.fn.ready )
@@ -67,7 +67,7 @@ function jQuery(a,c) {
// If so, execute it in context
if ( fn && fn.constructor == Function )
this.each(fn);
-}
+};
// Map over the $ in case of overwrite
if ( typeof $ != "undefined" )
View
1  src/outro.js
@@ -0,0 +1 @@
+} // close: if(typeof window.jQuery == "undefined") {
Please sign in to comment.
Something went wrong with that request. Please try again.