Skip to content

Commit df96a7b

Browse files
committed
Upgrade to jQuery 1.7.2 and jQuery UI 1.8.20
2 parents 469a76c + 8226f9f commit df96a7b

File tree

391 files changed

+31405
-2715
lines changed

Some content is hidden

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

391 files changed

+31405
-2715
lines changed

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
build/dist
2-
build/size
3-
build/build/.sizecache.json
1+
dist
2+
node_modules
43
docs
54
.project
65
*~

MIT-LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
1+
Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
22

33
This software consists of voluntary contributions made by many
44
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact

build/build.xml

Lines changed: 0 additions & 420 deletions
This file was deleted.

build/build/ant-contrib-0.6.jar

-117 KB
Binary file not shown.

build/build/sizer.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

build/build/style.xsl

Lines changed: 0 additions & 211 deletions
This file was deleted.

build/build/yuicompressor-2.4.2.jar

-831 KB
Binary file not shown.

build/release/prepare-release

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ echo "------------------------"
4545
echo
4646

4747
# NOTE: this will be different for minor and major releases
48-
version_new=`cat version.txt`
48+
version_new=`node -e "console.log(require(\"${repo_dir}/package\").version)"`
4949
version_new=${version_new:0:$((${#version_new} - 3))}
5050
major_minor=${version_new%.*}
5151
point=${version_new##*.}
@@ -154,21 +154,23 @@ echo "| UPDATING VERSION |"
154154
echo "--------------------"
155155
echo
156156

157-
echo "Updating version.txt to $version_new..."
158-
echo $version_new > version.txt
157+
echo "Updating package.json to $version_new..."
158+
sed "s/\(version\": \"\)\([^\"]*\)/\1${version_new}/" < package.json > _package.json
159+
mv _package.json package.json
159160

160161
git commit -a -m "Tagging the $version_new release."
161162
version_new_time=`git log -1 --pretty=format:"%ad"`
162-
echo "Committed version.txt at $version_new_time..."
163+
echo "Committed package.json at $version_new_time..."
163164

164165
echo "Tagging $version_new..."
165166
git tag $version_new
166167

167-
echo "Updating version.txt to $version_next..."
168-
echo $version_next > version.txt
168+
echo "Updating package.json to $version_next..."
169+
sed "s/\(version\": \"\)\([^\"]*\)/\1${version_next}/" < package.json > _package.json
170+
mv _package.json package.json
169171

170172
git commit -a -m "Updating the $git_branch version to $version_next"
171-
echo "Committed version.txt..."
173+
echo "Committed package.json..."
172174

173175
echo
174176
echo "Version update complete."
@@ -239,16 +241,14 @@ echo
239241
# check out the tagged version
240242
echo "Checking out $version_new..."
241243
git checkout $version_new
242-
cd build
243244

244-
# Update the link to the docs (never contains the patch version)
245-
echo "Updating URL for API docs..."
246-
sed "s/UI\/API\/\${release\.version}/UI\/API\/$major_minor/" build.xml >build.xml.tmp
247-
mv build.xml.tmp build.xml
245+
# install dependencies
246+
echo "Installing dependencies..."
247+
npm install
248248

249249
# Run the build
250250
echo "Running build..."
251-
ant
251+
grunt release
252252

253253
echo
254254
echo "Build complete."
@@ -300,7 +300,7 @@ svn co --depth immediates https://jquery-ui.googlecode.com/svn/tags
300300
cd tags
301301

302302
echo "Unzipping build into tags/$version_new..."
303-
unzip $repo_dir/build/dist/jquery-ui-$version_new.zip
303+
unzip $repo_dir/dist/jquery-ui-$version_new.zip
304304
mv jquery-ui-$version_new $version_new
305305

306306
echo "Adding files to SVN..."
@@ -328,7 +328,7 @@ echo
328328

329329
#
330330
# Generate themes
331-
#
331+
#
332332

333333

334334

demos/accordion/collapsible.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - Collapse content</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.6.4.js"></script>
7+
<script src="../../jquery-1.7.2.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
1010
<script src="../../ui/jquery.ui.accordion.js"></script>

demos/accordion/custom-icons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - Customize icons</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.6.4.js"></script>
7+
<script src="../../jquery-1.7.2.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
1010
<script src="../../ui/jquery.ui.accordion.js"></script>

demos/accordion/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - Default functionality</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.6.4.js"></script>
7+
<script src="../../jquery-1.7.2.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
1010
<script src="../../ui/jquery.ui.accordion.js"></script>

demos/accordion/fillspace.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - Fill space</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.6.4.js"></script>
7+
<script src="../../jquery-1.7.2.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
1010
<script src="../../ui/jquery.ui.mouse.js"></script>

0 commit comments

Comments
 (0)