Moved the bulk of the selector code out into a separate file, changed the build files to represent this.

1 files changed, 63 insertions, 62 deletions

diff --git a/build.xml b/build.xml
index e2a415a93..fe28a15eb 100644
--- a/build.xml
+++ b/build.xml
@@ -14,18 +14,18 @@
 	3. Execute the standard jquery and packed targets to build your distribution
 
 	TODO Using this build file to create docs for a single plugin
-	-->

-

+	-->
+
 	<!-- SETUP -->
 
 	<property description="Source Folder" name="SRC_DIR" value="src" />
 	<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="Dir to look for plugins" name="PLUGIN_DIR" location="../plugins" />

+	<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="Add single plugins here" name="PLUGINS" value="none" />
 	<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="Folder for docs target" name="DOCS_DIR" value="${PREFIX}/docs" />
@@ -36,20 +36,21 @@
 	<property name="JQ" value="${DIST_DIR}/jquery.js" />
 	<property name="JQ_LITE" value="${DIST_DIR}/jquery.lite.js" />
 	<property name="JQ_MIN" value="${DIST_DIR}/jquery.min.js" />
-	<property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.js" />

-

-	<!-- MAIN -->

-

+	<property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.js" />
+
+	<!-- MAIN -->
+
 	<target name="jquery" description="Main jquery build, set PLUGINS property to include plugins">
 		<echo message="Building ${JQ}" />
 		<mkdir dir="${DIST_DIR}" />
-		<concat destfile="${JQ}">

+		<concat destfile="${JQ}">
 			<fileset dir="${SRC_DIR}" includes="intro.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="fx/fx.js" />
-			<fileset dir="${SRC_DIR}" includes="ajax/ajax.js" />

-			<fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />

+			<fileset dir="${SRC_DIR}" includes="ajax/ajax.js" />
+			<fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
 			<fileset dir="${SRC_DIR}" includes="outro.js" />
 		</concat>
 		<echo message="${JQ} built." />
@@ -58,7 +59,7 @@
 	<target name="jquery_with_plugins" description="Build jquery with all plugins, useful to full documentation">
 		<antcall target="jquery">
 			<param name="PLUGINS" value="${PLUGINS_ALL}" />
-		</antcall>

+		</antcall>
 	</target>
 
 	<target name="lite" depends="jquery" description="Remove all /** */ comments">
@@ -89,24 +90,24 @@
 			<arg value="${JQ_PACK}" />
 		</java>
 		<echo message="${JQ_PACK} built." />
-	</target>

-

-	<target name="pack_with_plugins" depends="jquery_with_plugins" description="Pack jquery with all plugins, not very useful">

-		<echo message="Building ${JQ_PACK}" />

-		<java jar="${JAR}" fork="true">

-			<arg value="${BUILD_DIR}/build/pack.js" />

-			<arg value="${JQ}" />

-			<arg value="${JQ_PACK}" />

-		</java>

-		<echo message="${JQ_PACK} built." />

+	</target>
+
+	<target name="pack_with_plugins" depends="jquery_with_plugins" description="Pack jquery with all plugins, not very useful">
+		<echo message="Building ${JQ_PACK}" />
+		<java jar="${JAR}" fork="true">
+			<arg value="${BUILD_DIR}/build/pack.js" />
+			<arg value="${JQ}" />
+			<arg value="${JQ_PACK}" />
+		</java>
+		<echo message="${JQ_PACK} built." />
 	</target>
 
 	<target name="test" depends="jquery" description="Copy files for the test suite into their own directory.">
 		<echo message="Building Test Suite" />
 		<delete dir="${TEST_DIR}" />
-		<mkdir dir="${TEST_DIR}/data" />

-		<copy todir="${TEST_DIR}/data">

-			<fileset dir="${BUILD_DIR}/test/data/" />

+		<mkdir dir="${TEST_DIR}/data" />
+		<copy todir="${TEST_DIR}/data">
+			<fileset dir="${BUILD_DIR}/test/data/" />
 		</copy>
 		<copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
 		<echo message="Test Suite built." />
@@ -134,31 +135,31 @@
 			<arg value="${DOCS_DIR}" />
 		</java>
 		<echo message="Documentation built." />
-	</target>

-
-	<!-- TODO refactor to remove duplication with above -->

-	<target name="docs_with_plugins" depends="jquery_with_plugins">

-		<echo message="Building Documentation" />

-		<delete dir="${DOCS_DIR}" />

-		<mkdir dir="${DOCS_DIR}/data" />

-		<copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" />

-		<mkdir dir="${DOCS_DIR}/js" />

-		<copy todir="${DOCS_DIR}/js">

-			<fileset dir="${BUILD_DIR}/docs/js">

-				<include name="**/*.js" />

-			</fileset>

-		</copy>

-		<copy todir="${DOCS_DIR}/style">

-			<fileset dir="${BUILD_DIR}/docs/style">

-				<include name="**" />

-			</fileset>

-		</copy>

-		<java jar="${JAR}" fork="true">

-			<arg value="${BUILD_DIR}/docs/docs.js" />

-			<arg value="${JQ}" />

-			<arg value="${DOCS_DIR}" />

-		</java>

-		<echo message="Documentation built." />

+	</target>
+
+	<!-- TODO refactor to remove duplication with above -->
+	<target name="docs_with_plugins" depends="jquery_with_plugins">
+		<echo message="Building Documentation" />
+		<delete dir="${DOCS_DIR}" />
+		<mkdir dir="${DOCS_DIR}/data" />
+		<copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" />
+		<mkdir dir="${DOCS_DIR}/js" />
+		<copy todir="${DOCS_DIR}/js">
+			<fileset dir="${BUILD_DIR}/docs/js">
+				<include name="**/*.js" />
+			</fileset>
+		</copy>
+		<copy todir="${DOCS_DIR}/style">
+			<fileset dir="${BUILD_DIR}/docs/style">
+				<include name="**" />
+			</fileset>
+		</copy>
+		<java jar="${JAR}" fork="true">
+			<arg value="${BUILD_DIR}/docs/docs.js" />
+			<arg value="${JQ}" />
+			<arg value="${DOCS_DIR}" />
+		</java>
+		<echo message="Documentation built." />
 	</target>
 
 	<target name="clean">
@@ -176,15 +177,15 @@
 	<property name="TABS" value="${PLUGIN_DIR}/tabs/tabs.js" />
 	<property name="TABS_PACK" value="${DIST_DIR}/jquery.tabs.pack.js" />
 
-	<target name="pack_tabs">

-		<echo message="Building ${TABS_PACK}" />

-		<mkdir dir="${DIST_DIR}" />

-		<java jar="${JAR}" fork="true">

-			<arg value="${BUILD_DIR}/build/pack.js" />

-			<arg value="${TABS}" />

-			<arg value="${TABS_PACK}" />

-		</java>

-		<echo message="${TABS_PACK} built." />

-	</target>

+	<target name="pack_tabs">
+		<echo message="Building ${TABS_PACK}" />
+		<mkdir dir="${DIST_DIR}" />
+		<java jar="${JAR}" fork="true">
+			<arg value="${BUILD_DIR}/build/pack.js" />
+			<arg value="${TABS}" />
+			<arg value="${TABS_PACK}" />
+		</java>
+		<echo message="${TABS_PACK} built." />
+	</target>
 
 </project>