]> source.dussan.org Git - jquery.git/commitdiff
support.js needs to come before event.js (also placed in a temporary setTimeout to...
authorJohn Resig <jeresig@gmail.com>
Mon, 7 Dec 2009 15:45:20 +0000 (07:45 -0800)
committerJohn Resig <jeresig@gmail.com>
Mon, 7 Dec 2009 15:45:20 +0000 (07:45 -0800)
Makefile
Rakefile
build.xml
src/support.js

index a57b3c0ddb231c9febbf8b7d9a2db6a2b2d1ceec..bf1b2e7b490b1da992c8ae6f4a87a75f6d4435ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ PREFIX = .
 DIST_DIR = ${PREFIX}/dist
 
 BASE_FILES = ${SRC_DIR}/core.js\
+       ${SRC_DIR}/support.js\
        ${SRC_DIR}/data.js\
        ${SRC_DIR}/queue.js\
        ${SRC_DIR}/event.js\
-       ${SRC_DIR}/support.js\
        ${SRC_DIR}/selector.js\
        ${SRC_DIR}/traversing.js\
        ${SRC_DIR}/attributes.js\
index 54fa3e8aa18a95dfe41ee3d046021bd77dcc4471..c0cafc9374e21ede9b91497f78ab9e96e79a99d7 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
 # Basic Rakefile for building jQuery
-files = [ "intro", "core", "data", "queue", "event", "support", "selector", "traversing", "attributes", "manipulation", "css", "ajax", "fx", "offset", "dimensions", "outro" ]
+files = [ "intro", "core", "suppport", "data", "queue", "event", "selector", "traversing", "attributes", "manipulation", "css", "ajax", "fx", "offset", "dimensions", "outro" ]
 
 date = `git log -1 | grep Date: | sed 's/[^:]*: *//'`.gsub(/\n/, "")
 version = `cat version.txt`.gsub(/\n/, "")
index 8efd387c3f0450b176bae0f4d586c50382da7765..e992e4e46c03c9d93a5e6783edc86f78cac72f6d 100644 (file)
--- a/build.xml
+++ b/build.xml
         <concat destfile="${JQ}">
             <fileset dir="${SRC_DIR}" includes="intro.js" />
             <fileset dir="${SRC_DIR}" includes="core.js" />
+            <fileset dir="${SRC_DIR}" includes="support.js" />
             <fileset dir="${SRC_DIR}" includes="data.js" />
             <fileset dir="${SRC_DIR}" includes="queue.js" />
             <fileset dir="${SRC_DIR}" includes="event.js" />
-            <fileset dir="${SRC_DIR}" includes="support.js" />
             <fileset dir="${SRC_DIR}" includes="selector.js" />
             <fileset dir="${SRC_DIR}" includes="traversing.js" />
             <fileset dir="${SRC_DIR}" includes="attributes.js" />
index 9d5558f396a81864b269e0fd8d76b0c326833ed4..b7da5e5b1d553dc0e02826b2e54101ae9b26662e 100644 (file)
@@ -81,6 +81,8 @@
 
        // Figure out if the W3C box model works as expected
        // document.body must exist before we can do this
+       // TODO: This timeout is temporary until I move ready into core.js.
+       setTimeout(function(){
        jQuery(function(){
                var div = document.createElement("div");
                div.style.width = div.style.paddingLeft = "1px";
@@ -90,6 +92,7 @@
                document.body.removeChild( div ).style.display = 'none';
                div = null;
        });
+       }, 13);
 
        // Technique from Juriy Zaytsev
        // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/