Skip to content

Commit 4929eed

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into mask
Conflicts: build/tasks/testswarm.js tests/unit/all.html
2 parents 62eb666 + 0e80063 commit 4929eed

File tree

374 files changed

+21134
-12563
lines changed

Some content is hidden

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

374 files changed

+21134
-12563
lines changed

‎.editorconfig

+5
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@ end_of_line = lf
99
charset = utf-8
1010
trim_trailing_whitespace = true
1111
insert_final_newline = true
12+
13+
[external/**]
14+
trim_trailing_whitespace = false
15+
insert_final_newline = varies
16+
end_of_line = varies

‎.jshintrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"eqnull": true,
44
"eqeqeq": true,
55
"expr": true,
6-
"latedef": true,
76
"noarg": true,
7+
"node": true,
88
"onevar": true,
9-
"smarttabs": true,
109
"trailing": true,
11-
"undef": true
10+
"undef": true,
11+
"unused": true
1212
}

‎build/.jshintrc

-13
This file was deleted.

‎build/release/changelog-shell

+32
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,86 @@ DELETE EVERYTHING ABOVE THE FOLLOWING LINE
2424

2525
## Build
2626

27+
2728
## Core & Utilities
2829

2930
### UI Core
3031

32+
3133
### Mouse
3234

35+
3336
### Widget Factory
3437

38+
3539
### Position
3640

41+
3742
## Interactions
3843

3944
### Draggable
4045

46+
4147
### Droppable
4248

49+
4350
### Resizable
4451

52+
4553
### Selectable
4654

55+
4756
### Sortable
4857

58+
4959
## Widgets
5060

5161
### Accordion
5262

63+
5364
### Autocomplete
5465

66+
5567
### Button
5668

69+
5770
### Datepicker
5871

72+
5973
### Dialog
6074

75+
76+
### Menu
77+
78+
6179
### Progressbar
6280

81+
6382
### Slider
6483

84+
85+
### Spinner
86+
87+
6588
### Tabs
6689

90+
91+
### Tooltip
92+
93+
6794
## Effects
6895

96+
6997
### Individual effects
7098

99+
71100
## CSS Framework
72101

102+
73103
## Demos
74104

105+
75106
## Website
76107

108+
77109
### Download Builder

‎build/release/release.js

+4-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env node
2-
/*global cat:true cd:true cp:true echo:true exec:true exit:true ls:true*/
2+
/*global cat:true cd:true echo:true exec:true exit:true*/
3+
4+
"use strict";
35

46
var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime,
57
fs = require( "fs" ),
@@ -41,9 +43,6 @@ walk([
4143
section( "gathering contributors" ),
4244
gatherContributors,
4345

44-
section( "generating quick download" ),
45-
generateQuickDownload,
46-
4746
section( "updating trac" ),
4847
updateTrac,
4948
confirm
@@ -261,34 +260,6 @@ function gatherContributors() {
261260
echo( "Stored contributors in " + contributorsPath.cyan + "." );
262261
}
263262

264-
function generateQuickDownload() {
265-
var config,
266-
downloadDir = repoDir + "/node_modules/download.jqueryui.com",
267-
filename = "jquery-ui-" + newVersion + ".custom.zip",
268-
destination = baseDir + "/" + filename;
269-
270-
cd( downloadDir );
271-
272-
// Update jQuery UI version for download builder
273-
config = JSON.parse( cat( "config.json" ) );
274-
config.jqueryUi = newVersion;
275-
JSON.stringify( config ).to( "config.json" );
276-
277-
// Generate quick download
278-
// TODO: Find a way to avoid having to clone jquery-ui inside download builder
279-
if ( exec( "grunt prepare build" ).code !== 0 ) {
280-
abort( "Error generating quick download." );
281-
}
282-
cp( downloadDir + "/release/" + filename, destination );
283-
// cp() doesn't have error handling, so check for the file
284-
if ( ls( destination ).length !== 1 ) {
285-
abort( "Error copying quick download." );
286-
}
287-
288-
// Go back to repo directory for consistency
289-
cd( repoDir );
290-
}
291-
292263
function updateTrac() {
293264
echo( newVersion.cyan + " was tagged at " + tagTime.cyan + "." );
294265
echo( "Close the " + newVersion.cyan + " Milestone with the above date and time." );
@@ -423,7 +394,7 @@ function abort( msg ) {
423394
function walk( methods ) {
424395
var method = methods.shift();
425396

426-
function next( error ) {
397+
function next() {
427398
if ( methods.length ) {
428399
walk( methods );
429400
}

‎build/tasks/build.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
module.exports = function( grunt ) {
22

3-
var path = require( "path" );
3+
"use strict";
4+
5+
var path = require( "path" ),
6+
fs = require( "fs" );
47

58
grunt.registerTask( "manifest", "Generate jquery.json manifest files", function() {
69
var pkg = grunt.config( "pkg" ),
@@ -143,7 +146,7 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() {
143146
opts: {
144147
cwd: 'dist'
145148
}
146-
}, function( err, result ) {
149+
}, function( err ) {
147150
if ( err ) {
148151
grunt.log.error( err );
149152
done();

‎build/tasks/testswarm.js

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
1-
/*jshint node: true */
21
module.exports = function( grunt ) {
32

3+
"use strict";
4+
45
var versions = {
56
"git": "git",
6-
"1.8": "1.8.0 1.8.1 1.8.2",
7+
"1.8": "1.8.0 1.8.1 1.8.2 1.8.3",
78
"1.7": "1.7 1.7.1 1.7.2",
89
"1.6": "1.6 1.6.1 1.6.2 1.6.3 1.6.4"
910
},
1011
tests = {
1112
"Accordion": "accordion/accordion.html",
12-
"Accordion_deprecated": "accordion/accordion_deprecated.html",
1313
"Autocomplete": "autocomplete/autocomplete.html",
1414
"Button": "button/button.html",
1515
"Core": "core/core.html",
16-
//"datepicker/datepicker.html",
17-
//"dialog/dialog.html",
18-
//"draggable/draggable.html",
19-
//"droppable/droppable.html",
16+
"Datepicker": "datepicker/datepicker.html",
17+
"Dialog": "dialog/dialog.html",
18+
"Draggable": "draggable/draggable.html",
19+
"Droppable": "droppable/droppable.html",
2020
"Effects": "effects/effects.html",
2121
"Mask": "mask/mask.html",
2222
"Menu": "menu/menu.html",
2323
"Position": "position/position.html",
24-
"Position_deprecated": "position/position_deprecated.html",
2524
"Progressbar": "progressbar/progressbar.html",
26-
//"resizable/resizable.html",
27-
//"selectable/selectable.html",
28-
//"slider/slider.html",
29-
//"sortable/sortable.html",
25+
"Resizable": "resizable/resizable.html",
26+
"Selectable": "selectable/selectable.html",
27+
"Slider": "slider/slider.html",
28+
"Sortable": "sortable/sortable.html",
3029
"Spinner": "spinner/spinner.html",
3130
"Tabs": "tabs/tabs.html",
32-
"Tabs_deprecated": "tabs/tabs_deprecated.html",
3331
"Timepicker": "timepicker/timepicker.html",
3432
"Tooltip": "tooltip/tooltip.html",
3533
"Widget": "widget/widget.html"
@@ -55,9 +53,9 @@ function submit( commit, tests, configFile, version, done ) {
5553
authToken: config.authToken,
5654
jobName: 'jQuery UI ' + version + '#<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
5755
runMax: config.runMax,
58-
"runNames[]": Object.keys(tests),
56+
"runNames[]": Object.keys( tests ),
5957
"runUrls[]": testUrls,
60-
"browserSets[]": ["popular"]
58+
"browserSets[]": [ "popular-no-ie6" ]
6159
});
6260
}
6361

‎demos/accordion/collapsible.html

+1-1
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.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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

+1-1
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.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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

+1-1
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.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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

+1-1
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.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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>

‎demos/accordion/hoverintent.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - Open on hoverintent</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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/no-auto-height.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - No auto height</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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/sortable.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - Sortable</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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>

‎demos/addClass/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Effects - addClass demo</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.js"></script>
88
<script src="../../ui/jquery.ui.effect.js"></script>
99
<link rel="stylesheet" href="../demos.css">
1010
<style>

‎demos/animate/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Effects - Animate demo</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.js"></script>
88
<script src="../../ui/jquery.ui.effect.js"></script>
99
<link rel="stylesheet" href="../demos.css">
1010
<style>

‎demos/autocomplete/categories.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Autocomplete - Categories</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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.position.js"></script>

‎demos/autocomplete/combobox.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Autocomplete - Combobox</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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.button.js"></script>
@@ -111,7 +111,6 @@
111111

112112
input.data( "autocomplete" )._renderItem = function( ul, item ) {
113113
return $( "<li>" )
114-
.data( "item.autocomplete", item )
115114
.append( "<a>" + item.label + "</a>" )
116115
.appendTo( ul );
117116
};

‎demos/autocomplete/custom-data.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Autocomplete - Custom data and display</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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.position.js"></script>
@@ -68,7 +68,6 @@
6868
})
6969
.data( "autocomplete" )._renderItem = function( ul, item ) {
7070
return $( "<li>" )
71-
.data( "item.autocomplete", item )
7271
.append( "<a>" + item.label + "<br>" + item.desc + "</a>" )
7372
.appendTo( ul );
7473
};

‎demos/autocomplete/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Autocomplete - Default functionality</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.8.2.js"></script>
7+
<script src="../../jquery-1.8.3.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.position.js"></script>

0 commit comments

Comments
 (0)