Skip to content

Commit 4a4b5f1

Browse files
rdworthrdworth
committed
Merge commit '1.8.1' into formcontrols
2 parents e46e041 + 469d0c5 commit 4a4b5f1

File tree

107 files changed

+3656
-2109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3656
-2109
lines changed

‎.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
build/dist
2+
docs
3+
.project
4+
*~
5+
*.diff
6+
*.patch
7+
.DS_Store

‎AUTHORS.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
jQuery UI Authors (http://ui.jquery.com/about)
1+
jQuery UI Authors (http://jqueryui.com/about)
22

33
This software consists of voluntary contributions made by many
44
individuals. For exact contribution history, see the revision history
5-
and logs, available at http://jquery-ui.googlecode.com/svn/
5+
and logs, available at http://github.com/jquery/jquery-ui
66

77
Brandon Aaron
88
Paul Bakaus (paulbakaus.com)

‎README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[jQuery UI](http://jqueryui.com/) - Interactions and Widgets for the web
2+
================================
3+
4+
jQuery UI provides interactions like Drag and Drop and widgets like Autocomplete, Tabs and Slider and makes these as easy to use as jQuery itself.
5+
6+
If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started. Or visit the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
7+
8+
If you are interested in helping developing jQuery UI, you are in the right place.
9+
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).

‎build/build.xml

Lines changed: 97 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,26 @@
2222
<property name="release.filename" value="jquery-ui-${release.version}" />
2323

2424
<property name="dist.dir" value="dist/${release.filename}/" />
25+
<property name="cdndist.dir" value="dist/${release.filename}-googlecdn" />
2526
<property name="build.dir" value="build" />
2627
<property name="ui.dir" value="../" />
2728
<property name="src.dir" value="${ui.dir}/ui/" />
2829
<property name="theme.dir" value="${ui.dir}/themes/base/" />
2930
<property name="docs.dir" value="${ui.dir}/docs/" />
3031

31-
<property name="min.folder" value="${dist.dir}/ui/minified" />
32+
<property name="min.dir" value="${dist.dir}/ui/minified" />
3233

3334
<property name="concatenated" value="jquery-ui" />
3435
<property name="concatenated.i18n" value="jquery-ui-i18n" />
3536

3637
<property name="core.files" value="jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.effects.core.js" />
38+
<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" />
3739

38-
<property description="YUI Compressor" name="yui-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
40+
<property description="Google Closure" name="closure-jar" value="${build.dir}/google-compiler-20091218.jar" />
3941

40-
<target name="deploy-release" depends="docs-download, concatenate, minify, copy, replace-version, prepend-header, zip" description="Release builder">
42+
<target name="deploy-release" depends="clean, docs-download, concatenate, minify, copy, replace-version, prepend-header, zip, googlecdn" description="Release builder">
4143
</target>
42-
44+
4345
<target name="replace-version">
4446
<replaceregexp match="@VERSION" replace="${release.version}" flags="g" byline="true">
4547
<fileset dir="${dist.dir}/ui/" includes="*.js"/>
@@ -49,15 +51,14 @@
4951
</target>
5052

5153
<target name="prepend-header">
52-
<!-- TODO: refactor this ugly mess -->
5354
<copy todir="${dist.dir}/headers/">
5455
<fileset dir="${dist.dir}/ui/" includes="*.js" />
5556
</copy>
5657
<replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
5758
<fileset dir="${dist.dir}/headers/" includes="*.js"/>
5859
</replaceregexp>
5960
<for param="file">
60-
<path><fileset dir="${dist.dir}/ui/minified/" includes="*.js" /></path>
61+
<path><fileset dir="${min.dir}/" includes="*.js" /></path>
6162
<sequential>
6263
<propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.js$" replace="\1"/>
6364
<concat destfile="${dist.dir}/ui-headered/${target}.min.js">
@@ -66,9 +67,33 @@
6667
</concat>
6768
</sequential>
6869
</for>
69-
<copy todir="${dist.dir}/ui/minified">
70+
<copy todir="${min.dir}">
7071
<fileset dir="${dist.dir}/ui-headered/" includes="*.js" />
7172
</copy>
73+
74+
<!-- once more for the i18n files -->
75+
<!-- need to clean up headers in those files first
76+
<copy todir="${dist.dir}/headers/i18n/">
77+
<fileset dir="${dist.dir}/ui/i18n/" includes="*.js" />
78+
</copy>
79+
<replaceregexp match="^(\/\*.*?\*\/\s).+" replace="\1" flags="s">
80+
<fileset dir="${dist.dir}/headers/i18n/" includes="*.js"/>
81+
</replaceregexp>
82+
<for param="file">
83+
<path><fileset dir="${min.dir}/i18n/" includes="*.js" /></path>
84+
<sequential>
85+
<propertyregex override="yes" property="target" input="@{file}" regexp=".*[\\/](.+)\.min\.js$" replace="\1"/>
86+
<concat destfile="${dist.dir}/ui-headered/i18n/${target}.min.js">
87+
<header file="${dist.dir}/headers/i18n/${target}.js" />
88+
<fileset file="@{file}" />
89+
</concat>
90+
</sequential>
91+
</for>
92+
<copy todir="${min.dir}/i18n/">
93+
<fileset dir="${dist.dir}/ui-headered/i18n/" includes="*.js" />
94+
</copy>
95+
-->
96+
7297
<delete dir="${dist.dir}/headers/" />
7398
<delete dir="${dist.dir}/ui-headered/" />
7499
</target>
@@ -108,38 +133,45 @@
108133

109134
<target name="minify" depends="concatenate" description="Remove all comments and whitespace, no compression, great in combination with GZip">
110135
<echo message="Building minified" />
111-
<delete dir="${min.folder}/" />
112-
<mkdir dir="${min.folder}" />
113-
<delete dir="${min.folder}/i18n/" />
114-
<mkdir dir="${min.folder}/i18n/" />
115-
136+
<delete dir="${min.dir}/" />
137+
<mkdir dir="${min.dir}" />
138+
<delete dir="${min.dir}/i18n/" />
139+
<mkdir dir="${min.dir}/i18n/" />
140+
116141
<apply executable="java" parallel="false">
117-
<filelist dir="${dist.dir}/ui/" files="${concatenated}.js" />
118142
<fileset dir="${src.dir}/" includes="jquery.ui.*.js, jquery.effects.*.js" />
119143
<arg line="-jar" />
120-
<arg path="${yui-jar}" />
121-
<arg value="--charset" />
122-
<arg value="UTF-8" />
123-
<srcfile />
124-
<arg line="-o" />
125-
<mapper type="glob" from="*.js" to="${min.folder}/*.min.js" />
144+
<arg path="${closure-jar}" />
145+
<arg value="--warning_level" />
146+
<arg value="QUIET" />
147+
<arg value="--js_output_file" />
126148
<targetfile />
149+
<arg value="--js" />
150+
<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
127151
</apply>
128-
<echo message="Minified ui/ built." />
129152

153+
<concat destfile="${min.dir}/${concatenated}.min.js">
154+
<filelist dir="${min.dir}" files="${core.files.min}" />
155+
<fileset dir="${min.dir}" includes="jquery.ui.*.js, jquery.effects.*.js" excludes="${core.files.min}" />
156+
</concat>
157+
130158
<apply executable="java" parallel="false">
131-
<filelist dir="${dist.dir}/ui/i18n/" files="${concatenated.i18n}.js" />
132159
<fileset dir="${src.dir}/i18n/" includes="jquery.ui.*.js" />
133160
<arg line="-jar" />
134-
<arg path="${yui-jar}" />
135-
<arg value="--charset" />
136-
<arg value="UTF-8" />
137-
<srcfile />
138-
<arg line="-o" />
139-
<mapper type="glob" from="*.js" to="${min.folder}/i18n/*.min.js" />
161+
<arg path="${closure-jar}" />
162+
<arg value="--warning_level" />
163+
<arg value="QUIET" />
164+
<arg value="--js_output_file" />
140165
<targetfile />
166+
<arg value="--js" />
167+
<mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
141168
</apply>
142-
<echo message="Minified ui/i18n/ built." />
169+
170+
<concat destfile="${min.dir}/i18n/${concatenated.i18n}.min.js">
171+
<fileset dir="${min.dir}/i18n" includes="jquery.ui.*.js" />
172+
</concat>
173+
174+
<echo message="Minified ui/ built." />
143175
</target>
144176

145177
<target description="Copy needed folders" name="copy">
@@ -207,7 +239,7 @@
207239
<get src="${url}Slider" dest="${docs.dir}slider.html" />
208240
<get src="${url}Tabs" dest="${docs.dir}tabs.html" />
209241

210-
<get src="http://docs.jquery.com/action/render/UI/Utility/Position" dest="${docs.dir}position.html" />
242+
<get src="${url}Position" dest="${docs.dir}position.html" />
211243

212244
<get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
213245
<get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
@@ -249,5 +281,41 @@
249281
</replaceregexp>
250282
<echo message="All trailing spaces removed." />
251283
</target>
284+
285+
<target name="googlecdn">
286+
<delete dir="${cdndist.dir}" />
287+
<mkdir dir="${cdndist.dir}" />
288+
<copy todir="${cdndist.dir}">
289+
<fileset dir=".." includes="AUTHORS.txt, GPL-LICENSE.txt, MIT-LICENSE.txt, version.txt" />
290+
</copy>
291+
<copy todir="${cdndist.dir}">
292+
<fileset dir="${dist.dir}ui" includes="jquery-ui.js" />
293+
<fileset dir="${dist.dir}ui/minified" includes="jquery-ui.min.js" />
294+
</copy>
295+
<copy todir="${cdndist.dir}/i18n">
296+
<fileset dir="${dist.dir}ui/i18n" />
297+
<fileset dir="${dist.dir}ui/minified/i18n" />
298+
</copy>
299+
<copy todir="${cdndist.dir}/themes">
300+
<fileset dir="${dist.dir}themes" />
301+
</copy>
302+
<checksum>
303+
<fileset dir="${cdndist.dir}" />
304+
</checksum>
305+
<for param="file">
306+
<path><fileset dir="${cdndist.dir}" includes="**/" excludes="**/*.MD5" /></path>
307+
<sequential>
308+
<!-- @{file} is an absolute path, use that ugly regexes to make it relative -->
309+
<propertyregex override="yes" property="relativepath" input="@{file}" regexp=".+?googlecdn[\\/](.+)$" replace="\1"/>
310+
<propertyregex override="yes" property="relativepath" input="${relativepath}" regexp="\\" replace="/" global="true" />
311+
<concat destfile="${cdndist.dir}/MANIFEST" append="yes">${relativepath} </concat>
312+
<concat destfile="${cdndist.dir}/MANIFEST" append="yes"><file file="@{file}.MD5" /></concat>
313+
</sequential>
314+
</for>
315+
<delete dir="${cdndist.dir}" includes="**/*.MD5" />
316+
<zip destfile="${dist.dir}/../${release.filename}-googlecdn.zip">
317+
<zipfileset dir="${cdndist.dir}/" />
318+
</zip>
319+
</target>
252320

253321
</project>

0 commit comments

Comments
 (0)