Skip to content

J
jquery
Commit c3d8cb0c authored by John Resig's avatar John Resig
Browse files
Options

Moved the bulk of the selector code out into a separate file, changed the... 

Moved the bulk of the selector code out into a separate file, changed the build files to represent this.
parent 370c6d56
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 491 additions and 488 deletions
Makefile
View file @ c3d8cb0c
...@@ -8,6 +8,7 @@ DIST_DIR = ${PREFIX}/dist ...@@ -8,6 +8,7 @@ DIST_DIR = ${PREFIX}/dist
PLUG_DIR = ../plugins PLUG_DIR = ../plugins
BASE_FILES = ${SRC_DIR}/jquery/jquery.js\ BASE_FILES = ${SRC_DIR}/jquery/jquery.js\
${SRC_DIR}/selector/selector.js\
${SRC_DIR}/event/event.js\ ${SRC_DIR}/event/event.js\
${SRC_DIR}/fx/fx.js\ ${SRC_DIR}/fx/fx.js\
${SRC_DIR}/ajax/ajax.js ${SRC_DIR}/ajax/ajax.js
......
build.xml
View file @ c3d8cb0c
...@@ -14,18 +14,18 @@ ...@@ -14,18 +14,18 @@
3. Execute the standard jquery and packed targets to build your distribution 3. Execute the standard jquery and packed targets to build your distribution
TODO Using this build file to create docs for a single plugin TODO Using this build file to create docs for a single plugin
--> -->
<!-- SETUP --> <!-- SETUP -->
<property description="Source Folder" name="SRC_DIR" value="src" /> <property description="Source Folder" name="SRC_DIR" value="src" />
<property description="Files for parsing etc." name="BUILD_DIR" value="build" /> <property description="Files for parsing etc." name="BUILD_DIR" value="build" />
<property description="Rhino JS Engine" name="JAR" value="${BUILD_DIR}/js.jar" /> <property description="Rhino JS Engine" name="JAR" value="${BUILD_DIR}/js.jar" />
<property description="Dir to look for plugins" name="PLUGIN_DIR" location="../plugins" /> <property description="Dir to look for plugins" name="PLUGIN_DIR" location="../plugins" />
<property description="Add single plugins here" name="PLUGINS" value="none" /> <property description="Add single plugins here" name="PLUGINS" value="none" />
<property description="Add all plugins here" name="PLUGINS_ALL" <property description="Add all plugins here" name="PLUGINS_ALL"
value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.js" /> value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.js" />
<property description="Target parent folder for built files" name="PREFIX" value="." /> <property description="Target parent folder for built files" name="PREFIX" value="." />
<property description="Folder for docs target" name="DOCS_DIR" value="${PREFIX}/docs" /> <property description="Folder for docs target" name="DOCS_DIR" value="${PREFIX}/docs" />
...@@ -36,20 +36,21 @@ ...@@ -36,20 +36,21 @@
<property name="JQ" value="${DIST_DIR}/jquery.js" /> <property name="JQ" value="${DIST_DIR}/jquery.js" />
<property name="JQ_LITE" value="${DIST_DIR}/jquery.lite.js" /> <property name="JQ_LITE" value="${DIST_DIR}/jquery.lite.js" />
<property name="JQ_MIN" value="${DIST_DIR}/jquery.min.js" /> <property name="JQ_MIN" value="${DIST_DIR}/jquery.min.js" />
<property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.js" /> <property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.js" />
<!-- MAIN --> <!-- MAIN -->
<target name="jquery" description="Main jquery build, set PLUGINS property to include plugins"> <target name="jquery" description="Main jquery build, set PLUGINS property to include plugins">
<echo message="Building ${JQ}" /> <echo message="Building ${JQ}" />
<mkdir dir="${DIST_DIR}" /> <mkdir dir="${DIST_DIR}" />
<concat destfile="${JQ}"> <concat destfile="${JQ}">
<fileset dir="${SRC_DIR}" includes="intro.js" /> <fileset dir="${SRC_DIR}" includes="intro.js" />
<fileset dir="${SRC_DIR}" includes="jquery/jquery.js" /> <fileset dir="${SRC_DIR}" includes="jquery/jquery.js" />
<fileset dir="${SRC_DIR}" includes="selector/selector.js" />
<fileset dir="${SRC_DIR}" includes="event/event.js" /> <fileset dir="${SRC_DIR}" includes="event/event.js" />
<fileset dir="${SRC_DIR}" includes="fx/fx.js" /> <fileset dir="${SRC_DIR}" includes="fx/fx.js" />
<fileset dir="${SRC_DIR}" includes="ajax/ajax.js" /> <fileset dir="${SRC_DIR}" includes="ajax/ajax.js" />
<fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" /> <fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
<fileset dir="${SRC_DIR}" includes="outro.js" /> <fileset dir="${SRC_DIR}" includes="outro.js" />
</concat> </concat>
<echo message="${JQ} built." /> <echo message="${JQ} built." />
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
<target name="jquery_with_plugins" description="Build jquery with all plugins, useful to full documentation"> <target name="jquery_with_plugins" description="Build jquery with all plugins, useful to full documentation">
<antcall target="jquery"> <antcall target="jquery">
<param name="PLUGINS" value="${PLUGINS_ALL}" /> <param name="PLUGINS" value="${PLUGINS_ALL}" />
</antcall> </antcall>
</target> </target>
<target name="lite" depends="jquery" description="Remove all /** */ comments"> <target name="lite" depends="jquery" description="Remove all /** */ comments">
...@@ -89,24 +90,24 @@ ...@@ -89,24 +90,24 @@
<arg value="${JQ_PACK}" /> <arg value="${JQ_PACK}" />
</java> </java>
<echo message="${JQ_PACK} built." /> <echo message="${JQ_PACK} built." />
</target> </target>
<target name="pack_with_plugins" depends="jquery_with_plugins" description="Pack jquery with all plugins, not very useful"> <target name="pack_with_plugins" depends="jquery_with_plugins" description="Pack jquery with all plugins, not very useful">
<echo message="Building ${JQ_PACK}" /> <echo message="Building ${JQ_PACK}" />
<java jar="${JAR}" fork="true"> <java jar="${JAR}" fork="true">
<arg value="${BUILD_DIR}/build/pack.js" /> <arg value="${BUILD_DIR}/build/pack.js" />
<arg value="${JQ}" /> <arg value="${JQ}" />
<arg value="${JQ_PACK}" /> <arg value="${JQ_PACK}" />
</java> </java>
<echo message="${JQ_PACK} built." /> <echo message="${JQ_PACK} built." />
</target> </target>
<target name="test" depends="jquery" description="Copy files for the test suite into their own directory."> <target name="test" depends="jquery" description="Copy files for the test suite into their own directory.">
<echo message="Building Test Suite" /> <echo message="Building Test Suite" />
<delete dir="${TEST_DIR}" /> <delete dir="${TEST_DIR}" />
<mkdir dir="${TEST_DIR}/data" /> <mkdir dir="${TEST_DIR}/data" />
<copy todir="${TEST_DIR}/data"> <copy todir="${TEST_DIR}/data">
<fileset dir="${BUILD_DIR}/test/data/" /> <fileset dir="${BUILD_DIR}/test/data/" />
</copy> </copy>
<copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" /> <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
<echo message="Test Suite built." /> <echo message="Test Suite built." />
...@@ -134,31 +135,31 @@ ...@@ -134,31 +135,31 @@
<arg value="${DOCS_DIR}" /> <arg value="${DOCS_DIR}" />
</java> </java>
<echo message="Documentation built." /> <echo message="Documentation built." />
</target> </target>
<!-- TODO refactor to remove duplication with above --> <!-- TODO refactor to remove duplication with above -->
<target name="docs_with_plugins" depends="jquery_with_plugins"> <target name="docs_with_plugins" depends="jquery_with_plugins">
<echo message="Building Documentation" /> <echo message="Building Documentation" />
<delete dir="${DOCS_DIR}" /> <delete dir="${DOCS_DIR}" />
<mkdir dir="${DOCS_DIR}/data" /> <mkdir dir="${DOCS_DIR}/data" />
<copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" /> <copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" />
<mkdir dir="${DOCS_DIR}/js" /> <mkdir dir="${DOCS_DIR}/js" />
<copy todir="${DOCS_DIR}/js"> <copy todir="${DOCS_DIR}/js">
<fileset dir="${BUILD_DIR}/docs/js"> <fileset dir="${BUILD_DIR}/docs/js">
<include name="**/*.js" /> <include name="**/*.js" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${DOCS_DIR}/style"> <copy todir="${DOCS_DIR}/style">
<fileset dir="${BUILD_DIR}/docs/style"> <fileset dir="${BUILD_DIR}/docs/style">
<include name="**" /> <include name="**" />
</fileset> </fileset>
</copy> </copy>
<java jar="${JAR}" fork="true"> <java jar="${JAR}" fork="true">
<arg value="${BUILD_DIR}/docs/docs.js" /> <arg value="${BUILD_DIR}/docs/docs.js" />
<arg value="${JQ}" /> <arg value="${JQ}" />
<arg value="${DOCS_DIR}" /> <arg value="${DOCS_DIR}" />
</java> </java>
<echo message="Documentation built." /> <echo message="Documentation built." />
</target> </target>
<target name="clean"> <target name="clean">
...@@ -176,15 +177,15 @@ ...@@ -176,15 +177,15 @@
<property name="TABS" value="${PLUGIN_DIR}/tabs/tabs.js" /> <property name="TABS" value="${PLUGIN_DIR}/tabs/tabs.js" />
<property name="TABS_PACK" value="${DIST_DIR}/jquery.tabs.pack.js" /> <property name="TABS_PACK" value="${DIST_DIR}/jquery.tabs.pack.js" />
<target name="pack_tabs"> <target name="pack_tabs">
<echo message="Building ${TABS_PACK}" /> <echo message="Building ${TABS_PACK}" />
<mkdir dir="${DIST_DIR}" /> <mkdir dir="${DIST_DIR}" />
<java jar="${JAR}" fork="true"> <java jar="${JAR}" fork="true">
<arg value="${BUILD_DIR}/build/pack.js" /> <arg value="${BUILD_DIR}/build/pack.js" />
<arg value="${TABS}" /> <arg value="${TABS}" />
<arg value="${TABS_PACK}" /> <arg value="${TABS_PACK}" />
</java> </java>
<echo message="${TABS_PACK} built." /> <echo message="${TABS_PACK} built." />
</target> </target>
</project> </project>
src/jquery/jquery.js
View file @ c3d8cb0c
This diff is collapsed.
src/selector/selector.js 0 → 100644
View file @ c3d8cb0c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment