From b4e23b5af0820a66c2e275051f613f3df9a4444d Mon Sep 17 00:00:00 2001 From: John Resig Date: Sat, 8 Sep 2007 12:42:32 +0000 Subject: [PATCH] Reorganzing the jQuery source (first phase). --- Makefile | 22 +++++++++++----------- src/{ajax => }/ajax.js | 0 src/{event => }/event.js | 0 src/{fx => }/fx.js | 0 src/{jquery => }/jquery.js | 0 src/{selector => }/selector.js | 0 {build/test => test}/data/cow.jpg | Bin 1635 -> 1635 bytes {build/test => test}/data/dashboard.xml | 0 {build/test => test}/data/json.php | 0 {build/test => test}/data/json_obj.js | 0 {build/test => test}/data/jsonp.php | 0 {build/test => test}/data/name.html | 0 {build/test => test}/data/name.php | 0 {build/test => test}/data/test.html | 0 {build/test => test}/data/test.js | 0 {build/test => test}/data/test.php | 0 {build/test => test}/data/test2.html | 0 {build/test => test}/data/test3.html | 0 {build/test => test}/data/testrunner.js | 0 {build/test => test}/data/testsuite.css | 0 {build/test => test}/data/text.php | 0 {build/test => test}/data/with_fries.xml | 0 {build/test => test}/index.html | 10 +++++----- {build/test => test}/test.js | 0 {src/ajax => test/unit}/ajaxTest.js | 0 {src/jquery => test/unit}/coreTest.js | 0 {src/event => test/unit}/eventTest.js | 0 {src/fx => test/unit}/fxTest.js | 0 {src/selector => test/unit}/selectorTest.js | 0 29 files changed, 16 insertions(+), 16 deletions(-) rename src/{ajax => }/ajax.js (100%) rename src/{event => }/event.js (100%) rename src/{fx => }/fx.js (100%) rename src/{jquery => }/jquery.js (100%) rename src/{selector => }/selector.js (100%) rename {build/test => test}/data/cow.jpg (100%) rename {build/test => test}/data/dashboard.xml (100%) rename {build/test => test}/data/json.php (100%) rename {build/test => test}/data/json_obj.js (100%) rename {build/test => test}/data/jsonp.php (100%) rename {build/test => test}/data/name.html (100%) rename {build/test => test}/data/name.php (100%) rename {build/test => test}/data/test.html (100%) rename {build/test => test}/data/test.js (100%) rename {build/test => test}/data/test.php (100%) rename {build/test => test}/data/test2.html (100%) rename {build/test => test}/data/test3.html (100%) rename {build/test => test}/data/testrunner.js (100%) rename {build/test => test}/data/testsuite.css (100%) rename {build/test => test}/data/text.php (100%) rename {build/test => test}/data/with_fries.xml (100%) rename {build/test => test}/index.html (94%) rename {build/test => test}/test.js (100%) rename {src/ajax => test/unit}/ajaxTest.js (100%) rename {src/jquery => test/unit}/coreTest.js (100%) rename {src/event => test/unit}/eventTest.js (100%) rename {src/fx => test/unit}/fxTest.js (100%) rename {src/selector => test/unit}/selectorTest.js (100%) diff --git a/Makefile b/Makefile index 7518027..e9a977c 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,11 @@ DIST_DIR = ${PREFIX}/dist SPEED_DIR = ${PREFIX}/speed PLUG_DIR = ../plugins -BASE_FILES = ${SRC_DIR}/jquery/jquery.js\ - ${SRC_DIR}/selector/selector.js\ - ${SRC_DIR}/event/event.js\ - ${SRC_DIR}/ajax/ajax.js\ - ${SRC_DIR}/fx/fx.js +BASE_FILES = ${SRC_DIR}/core.js\ + ${SRC_DIR}/selector.js\ + ${SRC_DIR}/event.js\ + ${SRC_DIR}/ajax.js\ + ${SRC_DIR}/fx.js PLUGINS = ${PLUG_DIR}/button/*\ ${PLUG_DIR}/center/*\ @@ -47,7 +47,7 @@ VER = sed s/@VERSION/${JQ_VER}/ JAR = java -jar ${BUILD_DIR}/js.jar -all: jquery lite min pack docs test speed +all: jquery lite min pack speed @@echo "jQuery build complete." ${DIST_DIR}: @@ -110,17 +110,17 @@ test: ${JQ} @@echo "Building Test Suite" @@echo " - Making Test Suite Directory:" ${TEST_DIR} - @@mkdir -p ${TEST_DIR} + #@@mkdir -p ${TEST_DIR} @@echo " - Removing any old tests" - @@rm -f ${TEST_DIR}/tests/* + #@@rm -f ${TEST_DIR}/tests/* @@echo " - Copying over script files." - @@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data - @@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR} + #@@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data + #@@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR} @@echo " - Compiling Test Cases" - @@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR} + #@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR} @@echo "Test Suite Built" @@echo diff --git a/src/ajax/ajax.js b/src/ajax.js similarity index 100% rename from src/ajax/ajax.js rename to src/ajax.js diff --git a/src/event/event.js b/src/event.js similarity index 100% rename from src/event/event.js rename to src/event.js diff --git a/src/fx/fx.js b/src/fx.js similarity index 100% rename from src/fx/fx.js rename to src/fx.js diff --git a/src/jquery/jquery.js b/src/jquery.js similarity index 100% rename from src/jquery/jquery.js rename to src/jquery.js diff --git a/src/selector/selector.js b/src/selector.js similarity index 100% rename from src/selector/selector.js rename to src/selector.js diff --git a/build/test/data/cow.jpg b/test/data/cow.jpg similarity index 100% rename from build/test/data/cow.jpg rename to test/data/cow.jpg diff --git a/build/test/data/dashboard.xml b/test/data/dashboard.xml similarity index 100% rename from build/test/data/dashboard.xml rename to test/data/dashboard.xml diff --git a/build/test/data/json.php b/test/data/json.php similarity index 100% rename from build/test/data/json.php rename to test/data/json.php diff --git a/build/test/data/json_obj.js b/test/data/json_obj.js similarity index 100% rename from build/test/data/json_obj.js rename to test/data/json_obj.js diff --git a/build/test/data/jsonp.php b/test/data/jsonp.php similarity index 100% rename from build/test/data/jsonp.php rename to test/data/jsonp.php diff --git a/build/test/data/name.html b/test/data/name.html similarity index 100% rename from build/test/data/name.html rename to test/data/name.html diff --git a/build/test/data/name.php b/test/data/name.php similarity index 100% rename from build/test/data/name.php rename to test/data/name.php diff --git a/build/test/data/test.html b/test/data/test.html similarity index 100% rename from build/test/data/test.html rename to test/data/test.html diff --git a/build/test/data/test.js b/test/data/test.js similarity index 100% rename from build/test/data/test.js rename to test/data/test.js diff --git a/build/test/data/test.php b/test/data/test.php similarity index 100% rename from build/test/data/test.php rename to test/data/test.php diff --git a/build/test/data/test2.html b/test/data/test2.html similarity index 100% rename from build/test/data/test2.html rename to test/data/test2.html diff --git a/build/test/data/test3.html b/test/data/test3.html similarity index 100% rename from build/test/data/test3.html rename to test/data/test3.html diff --git a/build/test/data/testrunner.js b/test/data/testrunner.js similarity index 100% rename from build/test/data/testrunner.js rename to test/data/testrunner.js diff --git a/build/test/data/testsuite.css b/test/data/testsuite.css similarity index 100% rename from build/test/data/testsuite.css rename to test/data/testsuite.css diff --git a/build/test/data/text.php b/test/data/text.php similarity index 100% rename from build/test/data/text.php rename to test/data/text.php diff --git a/build/test/data/with_fries.xml b/test/data/with_fries.xml similarity index 100% rename from build/test/data/with_fries.xml rename to test/data/with_fries.xml diff --git a/build/test/index.html b/test/index.html similarity index 94% rename from build/test/index.html rename to test/index.html index b2876b7..7d60e09 100644 --- a/build/test/index.html +++ b/test/index.html @@ -6,11 +6,11 @@ - - - - - + + + + + diff --git a/build/test/test.js b/test/test.js similarity index 100% rename from build/test/test.js rename to test/test.js diff --git a/src/ajax/ajaxTest.js b/test/unit/ajaxTest.js similarity index 100% rename from src/ajax/ajaxTest.js rename to test/unit/ajaxTest.js diff --git a/src/jquery/coreTest.js b/test/unit/coreTest.js similarity index 100% rename from src/jquery/coreTest.js rename to test/unit/coreTest.js diff --git a/src/event/eventTest.js b/test/unit/eventTest.js similarity index 100% rename from src/event/eventTest.js rename to test/unit/eventTest.js diff --git a/src/fx/fxTest.js b/test/unit/fxTest.js similarity index 100% rename from src/fx/fxTest.js rename to test/unit/fxTest.js diff --git a/src/selector/selectorTest.js b/test/unit/selectorTest.js similarity index 100% rename from src/selector/selectorTest.js rename to test/unit/selectorTest.js -- 1.7.10.4