Permalink
Browse files

Merge commit '1.8.6' into devpreview

Conflicts:
	demos/autocomplete/categories.html
	demos/autocomplete/combobox.html
	demos/autocomplete/custom-data.html
	demos/autocomplete/default.html
	demos/autocomplete/folding.html
	demos/autocomplete/multiple-remote.html
	demos/autocomplete/multiple.html
	demos/autocomplete/remote-jsonp.html
	demos/autocomplete/remote-with-cache.html
	demos/autocomplete/remote.html
	demos/autocomplete/xml.html
	demos/button/splitbutton.html
	demos/index.html
	tests/unit/index.html
	tests/unit/widget/widget.js
	tests/visual/menu/nested.html
	themes/base/jquery.ui.autocomplete.css
	ui/jquery.ui.accordion.js
	ui/jquery.ui.autocomplete.js
  • Loading branch information...
2 parents b0d2241 + afdf74b commit 5d37f63313cfad9a72566d95a3c85e8958cc0be4 @jzaefferer jzaefferer committed Nov 19, 2010
Showing 445 changed files with 9,385 additions and 5,978 deletions.
View
@@ -18,11 +18,13 @@
<property file="ant.properties" />
- <loadfile failonerror="no" srcFile="../version.txt" property="release.version" />
+ <loadfile failonerror="no" srcFile="../version.txt" property="release.version">
+ <filterchain><striplinebreaks/></filterchain>
+ </loadfile>
<property name="release.filename" value="jquery-ui-${release.version}" />
<property name="dist.dir" value="dist/${release.filename}/" />
- <property name="cdndist.dir" value="dist/${release.filename}-googlecdn" />
+ <property name="cdndist.dir" value="dist/${release.filename}-cdn" />
<property name="build.dir" value="build" />
<property name="ui.dir" value="../" />
<property name="src.dir" value="${ui.dir}/ui/" />
@@ -38,14 +40,16 @@
<property name="core.files.min" value="jquery.ui.core.min.js, jquery.ui.widget.min.js, jquery.ui.mouse.min.js, jquery.ui.draggable.min.js, jquery.ui.droppable.min.js, jquery.ui.resizable.min.js, jquery.ui.selectable.min.js, jquery.ui.sortable.min.js, jquery.effects.core.min.js" />
<property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20091218.jar" />
+ <property description="YUI Compressor" name="yuicompressor-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
- <target name="deploy-release" depends="clean, docs-download, concatenate, minify, copy, replace-version, prepend-header, zip, googlecdn" description="Release builder">
+ <target name="deploy-release" depends="clean, docs-download, copy, minify, replace-version, prepend-header, zip" description="Release builder">
</target>
<target name="replace-version">
<replaceregexp match="@VERSION" replace="${release.version}" flags="g" byline="true">
<fileset dir="${dist.dir}/ui/" includes="*.js"/>
<fileset dir="${dist.dir}/ui/minified/" includes="*.js"/>
+ <fileset dir="${dist.dir}/themes/" includes="**/*.css"/>
</replaceregexp>
<echo message="Replaced all @VERSION to ${release.version}." />
</target>
@@ -67,10 +71,30 @@
</concat>
</sequential>
</for>
- <copy todir="${min.dir}">
+ <copy todir="${min.dir}" overwrite="true">
<fileset dir="${dist.dir}/ui-headered/" includes="*.js" />
</copy>
+ <copy todir="${dist.dir}/headers/">
+ <fileset dir="${dist.dir}/themes/base" includes="*.css" />
+ </copy>
+ <replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
+ <fileset dir="${dist.dir}/headers/" includes="*.css"/>
+ </replaceregexp>
+ <for param="file">
+ <path><fileset dir="${dist.dir}/themes/base/minified" includes="*.css" /></path>
+ <sequential>
+ <propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.css$" replace="\1"/>
+ <concat destfile="${dist.dir}/ui-headered/${target}.min.css">
+ <header file="${dist.dir}/headers/${target}.css" />
+ <fileset file="@{file}" />
+ </concat>
+ </sequential>
+ </for>
+ <copy todir="${dist.dir}/themes/base/minified" overwrite="true">
+ <fileset dir="${dist.dir}/ui-headered/" includes="*.css" />
+ </copy>
+
<!-- once more for the i18n files -->
<!-- need to clean up headers in those files first
<copy todir="${dist.dir}/headers/i18n/">
@@ -133,13 +157,12 @@
<target name="minify" depends="concatenate" description="Remove all comments and whitespace, no compression, great in combination with GZip">
<echo message="Building minified" />
- <delete dir="${min.dir}/" />
<mkdir dir="${min.dir}" />
- <delete dir="${min.dir}/i18n/" />
<mkdir dir="${min.dir}/i18n/" />
+ <mkdir dir="${dist.dir}/themes/base/minified" />
<apply executable="java" parallel="false">
- <fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" />
+ <fileset dir="${dist.dir}/ui" includes="*.js" />
<arg line="-jar" />
<arg path="${closure-jar}" />
<arg value="--warning_level" />
@@ -150,13 +173,8 @@
<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
</apply>
- <concat destfile="${min.dir}/${concatenated}.min.js">
- <filelist dir="${min.dir}" files="${core.files.min}" />
- <fileset dir="${min.dir}" includes="jquery.ui.*.js, jquery.effects.*.js" excludes="${core.files.min}" />
- </concat>
-
<apply executable="java" parallel="false">
- <fileset dir="${src.dir}/i18n/" includes="jquery.ui.*.js" />
+ <fileset dir="${dist.dir}/ui/i18n" includes="*.js" />
<arg line="-jar" />
<arg path="${closure-jar}" />
<arg value="--warning_level" />
@@ -167,9 +185,17 @@
<mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
</apply>
- <concat destfile="${min.dir}/i18n/${concatenated.i18n}.min.js">
- <fileset dir="${min.dir}/i18n" includes="jquery.ui.*.js" />
- </concat>
+ <apply executable="java" parallel="false">
+ <fileset dir="${dist.dir}/themes/base" includes="*.css" />
+ <arg line="-jar" />
+ <arg path="${yuicompressor-jar}" />
+ <arg line="--charset utf-8" />
+ <arg line="-v" />
+ <srcfile />
+ <arg line="-o" />
+ <mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
+ <targetfile/>
+ </apply>
<echo message="Minified ui/ built." />
</target>
@@ -216,7 +242,7 @@
<delete dir="dist" />
</target>
- <target name="docs-download" depends="docs-clean">
+ <target name="docs-download">
<mkdir dir="${docs.dir}" />
<property name="url" value="http://docs.jquery.com/action/render/UI/API/${release.version}/" />
@@ -267,10 +293,6 @@
<get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
</target>
- <target name="docs-clean">
- <delete dir="${docs.dir}" />
- </target>
-
<target name="themes-download">
<!-- to create/update query strings for the theme-file, execute this in Firebug on /download page:
$("select option[value!=none]").map(function() { $(this).parent().val(this.value).change(); return $(this).parents("form").serialize(); }).get().join(",");
@@ -298,8 +320,11 @@
<mapper type="regexp" from="(.*)jquery-ui-.*custom.css" to="\1jquery-ui.css" />
</mapper>
</move>
- <zip destfile="${dist.dir}/../${release.filename}-themes.zip">
- <zipfileset dir="${dist.dir}/" includes="AUTHORS.txt,GPL-LICENSE.txt,MIT-LICENSE.txt,version.txt,themes/**" />
+ <copy todir="dist/jquery-ui-themes-${release.version}">
+ <fileset dir="${dist.dir}/" includes="AUTHORS.txt,GPL-LICENSE.txt,MIT-LICENSE.txt,version.txt,themes/**" />
+ </copy>
+ <zip destfile="${dist.dir}/../jquery-ui-themes-${release.version}.zip">
+ <zipfileset dir="dist/" includes="jquery-ui-themes-${release.version}/" />
</zip>
</target>
@@ -311,7 +336,7 @@
<echo message="All trailing spaces removed." />
</target>
- <target name="googlecdn">
+ <target name="cdn">
<delete dir="${cdndist.dir}" />
<mkdir dir="${cdndist.dir}" />
<copy todir="${cdndist.dir}">
@@ -343,7 +368,10 @@
</for>
<delete dir="${cdndist.dir}" includes="**/*.MD5" />
<zip destfile="${dist.dir}/../${release.filename}-googlecdn.zip">
- <zipfileset dir="${cdndist.dir}/" />
+ <zipfileset dir="dist/" includes="${release.filename}-cdn/" />
+ </zip>
+ <zip destfile="${dist.dir}/../${release.filename}-mscdn.zip">
+ <zipfileset dir="dist/${release.filename}-cdn/" />
</zip>
</target>
Binary file not shown.
@@ -0,0 +1,79 @@
+
+This file contains a shell for the changelog, followed by a list of every commit for this release.
+
+Choose the appropriate line for the Summary section.
+
+Move all commit notes to the appropriate section.
+- Each line should be in the following format:
+ [Fixed|Added]: The ticket description. ([Ticket link], [Commit link])
+- If the commit is not related to a bug or feature, e.g., whitepsace cleanup, remove it.
+- If there is no ticket number, search Trac for the relevant ticket.
+ - If there is no ticket, create one (if needed), or leave just the commit link.
+
+Double check that "XXXX" does not appear anywhere in the changelog.
+
+Post this changelog at: CHANGELOG_URL
+
+
+
+DELETE EVERYTHING ABOVE THE FOLLOWING LINE
+------------------------------------------
+
+= Summary =
+This is the final release of jQuery UI 1.8.
+-- OR --
+This is the second maintenance release for [[UI/Changelog/1.8|jQuery UI 1.8]].
+
+= Build =
+
+= Core &amp; Utilities =
+
+=== UI Core ===
+
+=== Mouse ===
+
+=== Widget Factory ===
+
+=== Position ===
+
+= Interactions =
+
+=== Draggable ===
+
+=== Droppable ===
+
+=== Resizable ===
+
+=== Selectable ===
+
+=== Sortable ===
+
+= Widgets =
+
+=== Accordion ===
+
+=== Autocomplete ===
+
+=== Button ===
+
+=== Datepicker ===
+
+=== Dialog ===
+
+=== Progressbar ===
+
+=== Slider ===
+
+=== Tabs ===
+
+= Effects =
+
+=== Individual effects ===
+
+= CSS Framework =
+
+= Demos =
+
+= Website =
+
+=== Download Builder ===
Oops, something went wrong.

0 comments on commit 5d37f63

Please sign in to comment.