From: John Resig Date: Mon, 7 Dec 2009 15:45:20 +0000 (-0800) Subject: support.js needs to come before event.js (also placed in a temporary setTimeout to... X-Git-Tag: 1.4a2~83 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=afaae84a7a56bcbb69cb772d9ea29766ad0a2aa6;p=jquery.git support.js needs to come before event.js (also placed in a temporary setTimeout to delay the introduction of the ready in support - will remove when ready is moved to core.js, likely later today). --- diff --git a/Makefile b/Makefile index a57b3c0dd..bf1b2e7b4 100644 --- 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\ diff --git a/Rakefile b/Rakefile index 54fa3e8aa..c0cafc937 100644 --- 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/, "") diff --git a/build.xml b/build.xml index 8efd387c3..e992e4e46 100644 --- a/build.xml +++ b/build.xml @@ -37,10 +37,10 @@ + - diff --git a/src/support.js b/src/support.js index 9d5558f39..b7da5e5b1 100644 --- a/src/support.js +++ b/src/support.js @@ -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/