Skip to content
Permalink
Browse files

Merge branch 'master' of git://github.com/jquery/jquery into bug_2773

  • Loading branch information...
timmywil
timmywil committed Feb 26, 2011
2 parents ed48787 + 71bd828 commit 9e5ec378e35a04f123e82cb1cb5b3eb45254f6f4
Showing with 1,738 additions and 15,277 deletions.
  1. +26 −13 Makefile
  2. +7 −0 build/post-compile.js
  3. +2 −4 speed/jquery-basis.js
  4. +221 −138 src/ajax.js
  5. +17 −24 src/ajax/jsonp.js
  6. +7 −4 src/ajax/script.js
  7. +122 −116 src/ajax/xhr.js
  8. +5 −0 src/attributes.js
  9. +38 −32 src/core.js
  10. +1 −1 src/css.js
  11. +31 −4 src/data.js
  12. +9 −5 src/effects.js
  13. +46 −59 src/event.js
  14. +2 −2 src/intro.js
  15. +44 −27 src/manipulation.js
  16. +1 −1 src/offset.js
  17. +1 −0 src/outro.js
  18. +13 −9 src/support.js
  19. +5 −5 src/traversing.js
  20. +0 −15 test/data/css.php
  21. +2 −0 test/data/headers.php
  22. +0 −1 test/data/json_assigned_obj.js
  23. +1 −6 test/data/name.php
  24. +0 −1 test/data/notmodified.php
  25. +1 −1 test/data/offset/absolute.html
  26. +2 −2 test/data/offset/body.html
  27. +2 −2 test/data/offset/fixed.html
  28. +2 −2 test/data/offset/relative.html
  29. +2 −2 test/data/offset/scroll.html
  30. +2 −2 test/data/offset/static.html
  31. +2 −2 test/data/offset/table.html
  32. +1 −0 test/data/readywaitasset.js
  33. +25 −0 test/data/readywaitloader.js
  34. +5 −1 test/data/script.php
  35. +94 −61 test/delegatetest.html
  36. +1 −1 test/index.html
  37. +92 −0 test/localfile.html
  38. +101 −0 test/networkerror.html
  39. +0 −11 test/otherlibs/jquery/1.2.1/jquery.js
  40. +0 −11 test/otherlibs/jquery/1.2.3/jquery.js
  41. +0 −1,577 test/otherlibs/mootools/1.11/mootools.js
  42. +0 −4,221 test/otherlibs/prototype/1.6.0.2/prototype.js
  43. +0 −131 test/otherlibs/scriptaculous/1.7.0/builder.js
  44. +0 −835 test/otherlibs/scriptaculous/1.7.0/controls.js
  45. +0 −944 test/otherlibs/scriptaculous/1.7.0/dragdrop.js
  46. +0 −1,090 test/otherlibs/scriptaculous/1.7.0/effects.js
  47. +0 −51 test/otherlibs/scriptaculous/1.7.0/scriptaculous.js
  48. +0 −278 test/otherlibs/scriptaculous/1.7.0/slider.js
  49. +0 −564 test/otherlibs/scriptaculous/1.7.0/unittest.js
  50. +0 −136 test/otherlibs/scriptaculous/1.8.1/builder.js
  51. +0 −965 test/otherlibs/scriptaculous/1.8.1/controls.js
  52. +0 −974 test/otherlibs/scriptaculous/1.8.1/dragdrop.js
  53. +0 −1,122 test/otherlibs/scriptaculous/1.8.1/effects.js
  54. +0 −58 test/otherlibs/scriptaculous/1.8.1/scriptaculous.js
  55. +0 −275 test/otherlibs/scriptaculous/1.8.1/slider.js
  56. +0 −55 test/otherlibs/scriptaculous/1.8.1/sound.js
  57. +0 −568 test/otherlibs/scriptaculous/1.8.1/unittest.js
  58. +70 −35 test/polluted.php
  59. +85 −0 test/readywait.html
  60. +0 −41 test/test.js
  61. +355 −161 test/unit/ajax.js
  62. +19 −0 test/unit/attributes.js
  63. +57 −8 test/unit/core.js
  64. +28 −4 test/unit/data.js
  65. +92 −56 test/unit/effects.js
  66. +58 −45 test/unit/event.js
  67. +37 −4 test/unit/manipulation.js
  68. +0 −510 test/unit/selector.js
  69. +3 −3 test/unit/traversing.js
  70. +1 −1 version.txt
@@ -9,6 +9,7 @@ DIST_DIR = ${PREFIX}/dist

JS_ENGINE ?= `which node nodejs`
COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js

BASE_FILES = ${SRC_DIR}/core.js\
${SRC_DIR}/support.js\
@@ -43,7 +44,7 @@ VER = sed "s/@VERSION/${JQ_VER}/"

DATE=$(shell git log -1 --pretty=format:%ad)

all: init jquery min lint
all: jquery min lint
@@echo "jQuery build complete."

${DIST_DIR}:
@@ -68,12 +69,16 @@ define clone_or_pull

endef

init:
${QUNIT_DIR}:
$(call clone_or_pull, ${QUNIT_DIR}, git://github.com/jquery/qunit.git)

${SIZZLE_DIR}:
$(call clone_or_pull, ${SIZZLE_DIR}, git://github.com/jeresig/sizzle.git)

jquery: ${JQ}
jq: ${JQ}
init: ${QUNIT_DIR} ${SIZZLE_DIR}

jquery: init ${JQ}
jq: init ${JQ}

${JQ}: ${MODULES} | ${DIST_DIR}
@@echo "Building" ${JQ}
@@ -88,18 +93,26 @@ ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
@@echo "Building selector code from Sizzle"
@@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js

lint: ${JQ}
@@echo "Checking jQuery against JSLint..."
@@${JS_ENGINE} build/jslint-check.js
lint: jquery
@@if test ! -z ${JS_ENGINE}; then \
echo "Checking jQuery against JSLint..."; \
${JS_ENGINE} build/jslint-check.js; \
else \
echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
fi

min: ${JQ_MIN}

${JQ_MIN}: ${JQ}
@@echo "Building" ${JQ_MIN}
@@${COMPILER} ${JQ} > ${JQ_MIN}.tmp
@@echo ";" >> ${JQ_MIN}.tmp
@@sed 's/\*\/(/*\/ʩ(/' ${JQ_MIN}.tmp | tr "ʩ" "\n" > ${JQ_MIN}
@@rm -rf ${JQ_MIN}.tmp
${JQ_MIN}: jquery
@@if test ! -z ${JS_ENGINE}; then \
echo "Minifying jQuery" ${JQ_MIN}; \
${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
${POST_COMPILER} ${JQ_MIN}.tmp > ${JQ_MIN}; \
rm -f ${JQ_MIN}.tmp; \
else \
echo "You must have NodeJS installed in order to minify jQuery."; \
fi


clean:
@@echo "Removing Distribution directory:" ${DIST_DIR}
@@ -0,0 +1,7 @@
#!/usr/bin/env node

var print = require("sys").print,
src = require("fs").readFileSync(process.argv[2], "utf8");

// Previously done in sed but reimplemented here due to portability issues
print(src.replace(/^(\s*\*\/)(.+)/m, "$1\n$2;"));
@@ -524,11 +524,9 @@ jQuery.extend({
if ( data && rnotwhite.test(data) ) {
// Inspired by code by Andrea Giammarchi
// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
var head = document.getElementsByTagName("head")[0] || document.documentElement,
var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement,
script = document.createElement("script");

script.type = "text/javascript";

if ( jQuery.support.scriptEval ) {
script.appendChild( document.createTextNode( data ) );
} else {
@@ -5060,7 +5058,7 @@ jQuery.extend({
// If we're requesting a remote document
// and trying to load JSON or Script with a GET
if ( s.dataType === "script" && type === "GET" && remote ) {
var head = document.getElementsByTagName("head")[0] || document.documentElement;
var head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
var script = document.createElement("script");
script.src = s.url;
if ( s.scriptCharset ) {

0 comments on commit 9e5ec37

Please sign in to comment.
You can’t perform that action at this time.