Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
fnagel committed Oct 3, 2012
2 parents 5e12c54 + e8bdf46 commit cca4e77a95eb7024c204f4d0719baa2ef6195ed2
Showing with 20,790 additions and 3,580 deletions.
  1. +5 −0 AUTHORS.txt
  2. +2 −1 build/core.json
  3. +32 −34 build/release/changelog-shell
  4. +10 −4 build/release/release.js
  5. +50 −79 build/tasks/build.js
  6. +4 −3 build/tasks/testswarm.js
  7. +3 −10 demos/accordion/collapsible.html
  8. +3 −10 demos/accordion/custom-icons.html
  9. +3 −8 demos/accordion/default.html
  10. +34 −39 demos/accordion/fillspace.html
  11. +6 −11 demos/accordion/hoverintent.html
  12. +10 −14 demos/accordion/index.html
  13. +3 −10 demos/accordion/no-auto-height.html
  14. +3 −10 demos/accordion/sortable.html
  15. +3 −10 demos/addClass/default.html
  16. +4 −8 demos/addClass/index.html
  17. +3 −10 demos/animate/default.html
  18. +4 −8 demos/animate/index.html
  19. +6 −11 demos/autocomplete/categories.html
  20. +3 −10 demos/autocomplete/combobox.html
  21. +8 −13 demos/autocomplete/custom-data.html
  22. +3 −10 demos/autocomplete/default.html
  23. +3 −10 demos/autocomplete/folding.html
  24. +17 −19 demos/autocomplete/index.html
  25. +3 −10 demos/autocomplete/maxheight.html
  26. +3 −10 demos/autocomplete/multiple-remote.html
  27. +3 −10 demos/autocomplete/multiple.html
  28. +3 −10 demos/autocomplete/remote-jsonp.html
  29. +6 −16 demos/autocomplete/remote-with-cache.html
  30. +3 −10 demos/autocomplete/remote.html
  31. +3 −10 demos/autocomplete/xml.html
  32. +3 −10 demos/button/checkbox.html
  33. +8 −12 demos/button/default.html
  34. +24 −31 demos/button/icons.html
  35. +9 −13 demos/button/index.html
  36. +3 −10 demos/button/radio.html
  37. +12 −21 demos/button/splitbutton.html
  38. +5 −12 demos/button/toolbar.html
  39. +3 −10 demos/datepicker/alt-field.html
  40. +3 −10 demos/datepicker/animation.html
  41. +3 −10 demos/datepicker/buttonbar.html
  42. +3 −10 demos/datepicker/date-formats.html
  43. +3 −10 demos/datepicker/date-range.html
  44. +3 −10 demos/datepicker/default.html
  45. +3 −10 demos/datepicker/dropdown-month-year.html
  46. +3 −10 demos/datepicker/icon-trigger.html
  47. +17 −21 demos/datepicker/index.html
  48. +3 −10 demos/datepicker/inline.html
  49. +3 −10 demos/datepicker/localization.html
  50. +3 −10 demos/datepicker/min-max.html
  51. +3 −10 demos/datepicker/multiple-calendars.html
  52. +3 −10 demos/datepicker/other-months.html
  53. +3 −10 demos/datepicker/show-week.html
  54. +4 −320 demos/demos.css
  55. +3 −10 demos/dialog/animated.html
  56. +3 −24 demos/dialog/default.html
  57. +9 −13 demos/dialog/index.html
  58. +4 −26 demos/dialog/modal-confirmation.html
  59. +4 −14 demos/dialog/modal-form.html
  60. +4 −26 demos/dialog/modal-message.html
  61. +4 −26 demos/dialog/modal.html
  62. +12 −23 demos/draggable/constrain-movement.html
  63. +3 −10 demos/draggable/cursor-style.html
  64. +3 −10 demos/draggable/default.html
  65. +3 −10 demos/draggable/delay-start.html
  66. +3 −10 demos/draggable/events.html
  67. +3 −12 demos/draggable/handle.html
  68. +14 −18 demos/draggable/index.html
  69. +3 −10 demos/draggable/revert.html
  70. +3 −10 demos/draggable/scroll.html
  71. +3 −10 demos/draggable/snap-to.html
  72. +6 −13 demos/draggable/sortable.html
  73. +3 −10 demos/draggable/visual-feedback.html
  74. +3 −10 demos/droppable/accepted-elements.html
  75. +3 −10 demos/droppable/default.html
  76. +10 −14 demos/droppable/index.html
  77. +6 −8 demos/droppable/photo-manager.html
  78. +3 −10 demos/droppable/propagation.html
  79. +3 −10 demos/droppable/revert.html
  80. +3 −10 demos/droppable/shopping-cart.html
  81. +6 −12 demos/droppable/visual-feedback.html
  82. +6 −13 demos/effect/default.html
  83. +3 −10 demos/effect/easing.html
  84. +5 −9 demos/effect/index.html
  85. +3 −10 demos/hide/default.html
  86. +4 −8 demos/hide/index.html
  87. +30 −327 demos/index.html
  88. +19 −26 demos/menu/default.html
  89. +7 −9 demos/menu/index.html
  90. +39 −46 demos/menu/navigationmenu.html
  91. +4 −1 demos/menu/topalignmenu.html
  92. +30 −34 demos/position/cycler.html
  93. +3 −10 demos/position/default.html
  94. +5 −9 demos/position/index.html
  95. +3 −10 demos/progressbar/animated.html
  96. +3 −10 demos/progressbar/default.html
  97. +6 −10 demos/progressbar/index.html
  98. +3 −10 demos/progressbar/resize.html
  99. +3 −10 demos/removeClass/default.html
  100. +4 −8 demos/removeClass/index.html
  101. +3 −10 demos/resizable/animate.html
  102. +3 −10 demos/resizable/aspect-ratio.html
  103. +3 −10 demos/resizable/constrain-area.html
  104. +3 −10 demos/resizable/default.html
  105. +4 −11 demos/resizable/delay-start.html
  106. +3 −10 demos/resizable/helper.html
  107. +14 −18 demos/resizable/index.html
  108. +3 −10 demos/resizable/max-min.html
  109. +3 −10 demos/resizable/snap-to-grid.html
  110. +3 −10 demos/resizable/synchronous-resize.html
  111. +3 −10 demos/resizable/textarea.html
  112. +3 −10 demos/resizable/visual-feedback.html
  113. +4 −11 demos/selectable/default.html
  114. +5 −12 demos/selectable/display-grid.html
  115. +6 −10 demos/selectable/index.html
  116. +4 −11 demos/selectable/serialize.html
  117. +4 −11 demos/show/default.html
  118. +4 −8 demos/show/index.html
  119. +4 −12 demos/slider/colorpicker.html
  120. +3 −13 demos/slider/default.html
  121. +3 −13 demos/slider/hotelrooms.html
  122. +14 −19 demos/slider/index.html
  123. +5 −13 demos/slider/multiple-vertical.html
  124. +3 −13 demos/slider/range-vertical.html
  125. +3 −13 demos/slider/range.html
  126. +3 −13 demos/slider/rangemax.html
  127. +3 −13 demos/slider/rangemin.html
  128. +3 −11 demos/slider/side-scroll.html
  129. +3 −13 demos/slider/slider-vertical.html
  130. +3 −13 demos/slider/steps.html
  131. +0 −67 demos/slider/tabs.html
  132. +3 −9 demos/sortable/connect-lists-through-tabs.html
  133. +3 −9 demos/sortable/connect-lists.html
  134. +3 −9 demos/sortable/default.html
  135. +4 −10 demos/sortable/delay-start.html
  136. +4 −10 demos/sortable/display-grid.html
  137. +4 −10 demos/sortable/empty-lists.html
  138. +12 −16 demos/sortable/index.html
  139. +3 −9 demos/sortable/items.html
  140. +3 −9 demos/sortable/placeholder.html
  141. +5 −11 demos/sortable/portlets.html
  142. +2 −9 demos/spinner/currency.html
  143. +2 −9 demos/spinner/decimal.html
  144. +2 −9 demos/spinner/default.html
  145. +8 −12 demos/spinner/index.html
  146. +2 −9 demos/spinner/latlong.html
  147. +2 −9 demos/spinner/overflow.html
  148. +2 −7 demos/spinner/time.html
  149. +5 −12 demos/switchClass/default.html
  150. +4 −8 demos/switchClass/index.html
  151. +3 −10 demos/tabs/ajax.html
  152. +3 −10 demos/tabs/bottom.html
  153. +3 −10 demos/tabs/collapsible.html
  154. +3 −10 demos/tabs/default.html
  155. +10 −14 demos/tabs/index.html
  156. +23 −30 demos/tabs/manipulation.html
  157. +3 −12 demos/tabs/mouseover.html
  158. +4 −17 demos/tabs/sortable.html
  159. +3 −10 demos/tabs/vertical.html
  160. +2 −8 demos/toggle/default.html
  161. +4 −8 demos/toggle/index.html
  162. +3 −10 demos/toggleClass/default.html
  163. +4 −8 demos/toggleClass/index.html
  164. +2 −9 demos/tooltip/custom-animation.html
  165. +3 −10 demos/tooltip/custom-content.html
  166. +3 −10 demos/tooltip/custom-style.html
  167. +3 −10 demos/tooltip/default.html
  168. +2 −9 demos/tooltip/forms.html
  169. +9 −13 demos/tooltip/index.html
  170. +3 −10 demos/tooltip/tracking.html
  171. +3 −10 demos/tooltip/video-player.html
  172. +3 −11 demos/widget/default.html
  173. +4 −8 demos/widget/index.html
  174. +2 −6 grunt.js
  175. +9,440 −0 jquery-1.8.2.js
  176. +0 −1 package.json
  177. +1 −1 tests/index.html
  178. +662 −588 jquery-1.8.0.js → tests/jquery-1.8.1.js
  179. +9,440 −0 tests/jquery-1.8.2.js
  180. +1 −1 tests/jquery.js
  181. +18 −18 tests/unit/accordion/accordion_options.js
  182. +1 −1 tests/unit/accordion/all.html
  183. +1 −1 tests/unit/all-active.html
  184. +1 −1 tests/unit/all.html
  185. +1 −1 tests/unit/autocomplete/all.html
  186. +1 −1 tests/unit/button/all.html
  187. +1 −1 tests/unit/core/all.html
  188. +1 −1 tests/unit/datepicker/all.html
  189. +1 −1 tests/unit/dialog/all.html
  190. +1 −1 tests/unit/draggable/all.html
  191. +1 −1 tests/unit/droppable/all.html
  192. +1 −1 tests/unit/effects/all.html
  193. +1 −1 tests/unit/index.html
  194. +1 −1 tests/unit/menu/all.html
  195. +11 −7 tests/unit/menu/menu_events.js
  196. +1 −1 tests/unit/position/all.html
  197. +1 −1 tests/unit/progressbar/all.html
  198. +1 −1 tests/unit/resizable/all.html
  199. +1 −1 tests/unit/selectable/all.html
  200. +1 −1 tests/unit/slider/all.html
  201. +1 −1 tests/unit/sortable/all.html
  202. +1 −1 tests/unit/spinner/all.html
  203. +1 −1 tests/unit/subsuite.js
  204. +1 −1 tests/unit/tabs/all.html
  205. +8 −0 tests/unit/tabs/tabs.html
  206. +9 −0 tests/unit/tabs/tabs_core.js
  207. +8 −0 tests/unit/tabs/tabs_deprecated.html
  208. +1 −1 tests/unit/tooltip/all.html
  209. +29 −0 tests/unit/tooltip/tooltip_options.js
  210. +1 −1 tests/unit/widget/all.html
  211. +1 −1 tests/visual/accordion/icons.html
  212. +1 −1 tests/visual/addClass/queue.html
  213. +1 −1 tests/visual/button/button.html
  214. +1 −1 tests/visual/button/performance.html
  215. +1 −1 tests/visual/compound/accordion_tabs.html
  216. +1 −1 tests/visual/compound/datepicker_dialog.html
  217. +1 −1 tests/visual/compound/dialog_widgets.html
  218. +1 −1 tests/visual/compound/draggable_accordion.html
  219. +1 −1 tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
  220. +1 −1 tests/visual/compound/sortable_accordion_sortable_tabs.html
  221. +1 −1 tests/visual/compound/tabs_tabs.html
  222. +1 −1 tests/visual/compound/tabs_tooltips.html
  223. +1 −1 tests/visual/dialog/performance.html
  224. +1 −1 tests/visual/effects/all.html
  225. +1 −1 tests/visual/effects/scale.html
  226. +1 −1 tests/visual/index.html
  227. +1 −1 tests/visual/menu/menu.html
  228. +1 −1 tests/visual/position/position.html
  229. +1 −1 tests/visual/position/position_feedback.html
  230. +2 −2 tests/visual/theme.html
  231. +1 −1 tests/visual/tooltip/animations.html
  232. +2 −2 tests/visual/tooltip/tooltip.html
  233. +0 −1 themes/base/jquery.ui.theme.css
  234. +24 −18 ui/jquery.ui.accordion.js
  235. +1 −1 ui/jquery.ui.autocomplete.js
  236. +1 −1 ui/jquery.ui.button.js
  237. +1 −1 ui/jquery.ui.core.js
  238. +1 −1 ui/jquery.ui.datepicker.js
  239. +22 −24 ui/jquery.ui.dialog.js
  240. +5 −6 ui/jquery.ui.draggable.js
  241. +1 −1 ui/jquery.ui.droppable.js
  242. +1 −1 ui/jquery.ui.effect-blind.js
  243. +1 −1 ui/jquery.ui.effect-bounce.js
  244. +1 −1 ui/jquery.ui.effect-clip.js
  245. +1 −1 ui/jquery.ui.effect-drop.js
  246. +1 −1 ui/jquery.ui.effect-explode.js
  247. +1 −1 ui/jquery.ui.effect-fade.js
  248. +1 −1 ui/jquery.ui.effect-fold.js
  249. +1 −1 ui/jquery.ui.effect-highlight.js
  250. +1 −1 ui/jquery.ui.effect-pulsate.js
  251. +1 −1 ui/jquery.ui.effect-scale.js
  252. +1 −1 ui/jquery.ui.effect-shake.js
  253. +1 −1 ui/jquery.ui.effect-slide.js
  254. +1 −1 ui/jquery.ui.effect-transfer.js
  255. +1 −1 ui/jquery.ui.effect.js
  256. +22 −15 ui/jquery.ui.menu.js
  257. +1 −1 ui/jquery.ui.mouse.js
  258. +1 −1 ui/jquery.ui.position.js
  259. +1 −1 ui/jquery.ui.progressbar.js
  260. +1 −1 ui/jquery.ui.resizable.js
  261. +1 −1 ui/jquery.ui.selectable.js
  262. +1 −1 ui/jquery.ui.slider.js
  263. +1 −1 ui/jquery.ui.sortable.js
  264. +1 −1 ui/jquery.ui.spinner.js
  265. +2 −2 ui/jquery.ui.tabs.js
  266. +29 −8 ui/jquery.ui.tooltip.js
  267. +1 −1 ui/jquery.ui.widget.js
@@ -203,3 +203,8 @@ Luis Dalmolin <luis.nh@gmail.com>
Mark Aaron Shirley <maspwr@gmail.com>
Martin Hoch <martin@fidion.de>
Jiayi Yang <tr870829@gmail.com>
Philipp Benjamin Köppchen <xgxtpbk@gws.ms>
Sindre Sorhus <sindresorhus@gmail.com>
Bernhard Sirlinger <bernhard.sirlinger@tele2.de>
Jared A. Scheel <jared@jaredscheel.com>
Rafael Xavier de Souza <rxaviers@gmail.com>
@@ -62,6 +62,7 @@
"abstraction",
"state",
"factory"
]
],
"docs": "http://api.jqueryui.com/jQuery.widget/"
}
}
@@ -10,70 +10,68 @@ Move all commit notes to the appropriate section.
- 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.
Double check that "TICKETREF" does not appear anywhere in the changelog.

Post this changelog at: CHANGELOG_URL
Add this changelog to jqueryui.com.



DELETE EVERYTHING ABOVE THE FOLLOWING LINE
------------------------------------------
<script>{
"title": "{title}"
}</script>

= 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

= Build =
## Core &amp; Utilities

= Core &amp; Utilities =
### UI Core

=== UI Core ===
### Mouse

=== Mouse ===
### Widget Factory

=== Widget Factory ===
### Position

=== Position ===
## Interactions

= Interactions =
### Draggable

=== Draggable ===
### Droppable

=== Droppable ===
### Resizable

=== Resizable ===
### Selectable

=== Selectable ===
### Sortable

=== Sortable ===
## Widgets

= Widgets =
### Accordion

=== Accordion ===
### Autocomplete

=== Autocomplete ===
### Button

=== Button ===
### Datepicker

=== Datepicker ===
### Dialog

=== Dialog ===
### Progressbar

=== Progressbar ===
### Slider

=== Slider ===
### Tabs

=== Tabs ===
## Effects

= Effects =
### Individual effects

=== Individual effects ===
## CSS Framework

= CSS Framework =
## Demos

= Demos =
## Website

= Website =

=== Download Builder ===
### Download Builder
@@ -64,6 +64,9 @@ function cloneRepo() {
if ( exec( "npm install" ).code !== 0 ) {
abort( "Error installing dependencies." );
}
if ( exec( "npm install download.jqueryui.com" ).code !== 0 ) {
abort( "Error installing dependencies." );
}
echo();
}

@@ -103,10 +106,12 @@ function getVersions() {
major = parseInt( parts[ 0 ], 10 );
minor = parseInt( parts[ 1 ], 10 );
patch = parseInt( parts[ 2 ], 10 );

// TODO: handle 2.0.0
if ( minor === 0 ) {
abort( "This script is not smart enough to handle the 2.0.0 release." );
}

prevVersion = patch === 0 ?
[ major, minor - 1, 0 ].join( "." ) :
[ major, minor, patch - 1 ].join( "." );
@@ -143,8 +148,7 @@ function buildRelease() {
echo();

echo( "Building release..." );
// TODO: Build themes
if ( exec( "grunt release" ).code !== 0 ) {
if ( exec( "grunt release_cdn" ).code !== 0 ) {
abort( "Error building release." );
}
echo();
@@ -190,7 +194,9 @@ function generateChangelog() {
var commits,
changelogPath = baseDir + "/changelog",
changelog = cat( "build/release/changelog-shell" ) + "\n",
fullFormat = "* %s (TICKETREF, [http://github.com/jquery/jquery-ui/commit/%H %h])";
fullFormat = "* %s (TICKETREF, [%h](http://github.com/jquery/jquery-ui/commit/%H))";

changelog = changelog.replace( "{title}", "jQuery UI " + newVersion + " Changelog" );

echo ( "Adding commits..." );
commits = gitLog( fullFormat );
@@ -205,7 +211,7 @@ function generateChangelog() {
});
return tickets.length ?
commit.replace( "TICKETREF", tickets.map(function( ticket ) {
return "[http://bugs.jqueryui.com/ticket/" + ticket + " #" + ticket + "]";
return "[#" + ticket + "](http://bugs.jqueryui.com/ticket/" + ticket + ")";
}).join( ", " ) ) :
// Leave TICKETREF token in place so it's easy to find commits without tickets
commit;
@@ -171,97 +171,68 @@ grunt.registerMultiTask( "md5", "Create list of md5 hashes for CDN uploads", fun
grunt.log.writeln( "Wrote " + this.file.dest + " with " + hashes.length + " hashes" );
});

// only needed for 1.8
grunt.registerTask( "download_docs", function() {
function capitalize(value) {
return value[0].toUpperCase() + value.slice(1);
grunt.registerTask( "generate_themes", function() {
var download, files, done,
target = "dist/" + grunt.template.process( grunt.config( "files.themes" ), grunt.config() ) + "/",
distFolder = "dist/" + grunt.template.process( grunt.config( "files.dist" ), grunt.config() );
try {
require.resolve( "download.jqueryui.com" );
} catch( e ) {
throw "You need to manually install download.jqueryui.com for this task to work";
}
// should be grunt.config("pkg.version")?
var version = "1.8",
docsDir = "dist/docs",
files = "draggable droppable resizable selectable sortable accordion autocomplete button datepicker dialog progressbar slider tabs position"
.split(" ").map(function(widget) {
return {
url: "http://docs.jquery.com/action/render/UI/API/" + version + "/" + capitalize(widget),
dest: docsDir + '/' + widget + '.html'
};
});
files = files.concat("animate addClass effect hide removeClass show switchClass toggle toggleClass".split(" ").map(function(widget) {
return {
url: "http://docs.jquery.com/action/render/UI/Effects/" + widget,
dest: docsDir + '/' + widget + '.html'
};
}));
files = files.concat("Blind Clip Drop Explode Fade Fold Puff Slide Scale Bounce Highlight Pulsate Shake Size Transfer".split(" ").map(function(widget) {
return {
url: "http://docs.jquery.com/action/render/UI/Effects/" + widget,
dest: docsDir + '/effect-' + widget.toLowerCase() + '.html'
};
}));
grunt.file.mkdir( "dist/docs" );
grunt.utils.async.forEach( files, function( file, done ) {
var out = fs.createWriteStream( file.dest );
out.on( "close", done );
request( file.url ).pipe( out );
}, this.async() );
});

grunt.registerTask( "download_themes", function() {
// var AdmZip = require('adm-zip');
var done = this.async(),
themes = grunt.file.read( "build/themes" ).split(","),
requests = 0;
grunt.file.mkdir( "dist/tmp" );
themes.forEach(function( theme, index ) {
requests += 1;
grunt.file.mkdir( "dist/tmp/" + index );
var zipFileName = "dist/tmp/" + index + ".zip",
out = fs.createWriteStream( zipFileName );
out.on( "close", function() {
grunt.log.writeln( "done downloading " + zipFileName );
// TODO AdmZip produces "crc32 checksum failed", need to figure out why
// var zip = new AdmZip(zipFileName);
// zip.extractAllTo('dist/tmp/' + index + '/');
// until then, using cli unzip...
grunt.utils.spawn({
cmd: "unzip",
args: [ "-d", "dist/tmp/" + index, zipFileName ]
}, function( err, result ) {
grunt.log.writeln( "Unzipped " + zipFileName + ", deleting it now" );
fs.unlinkSync( zipFileName );
requests -= 1;
if (requests === 0) {
done();
}
});
});
request( "http://ui-dev.jquery.com/download/?" + theme ).pipe( out );
// copy release files into download builder to avoid cloning again
grunt.file.expandFiles( distFolder + "/**" ).forEach(function( file ) {
grunt.file.copy( file, "node_modules/download.jqueryui.com/release/" + file.replace(/^dist/, "") );
});
});

grunt.registerTask( "copy_themes", function() {
// each package includes the base theme, ignore that
var filter = /themes\/base/,
files = grunt.file.expandFiles( "dist/tmp/*/development-bundle/themes/**/*" ).filter(function( file ) {
return !filter.test( file );
}),
// TODO the grunt.template.process call shouldn't be necessary
target = "dist/" + grunt.template.process( grunt.config( "files.themes" ), grunt.config() ) + "/",
distFolder = "dist/" + grunt.template.process( grunt.config( "files.dist" ), grunt.config() );
files.forEach(function( fileName ) {
var targetFile = fileName.replace( /dist\/tmp\/\d+\/development-bundle\//, "" ).replace( "jquery-ui-.custom", "jquery-ui" );
grunt.file.copy( fileName, target + targetFile );
});
download = new ( require( "download.jqueryui.com" ) )();

// copy minified base theme from regular release
files = grunt.file.expandFiles( distFolder + "/themes/base/**/*" );
files.forEach(function( fileName ) {
grunt.file.copy( fileName, target + fileName.replace( distFolder, "" ) );
});

done = this.async();
grunt.utils.async.forEach( download.themeroller.gallery(), function( theme, done ) {
var folderName = theme.folderName(),
concatTarget = "css-" + folderName,
cssContent = theme.css(),
cssFolderName = target + "themes/" + folderName + "/",
cssFileName = cssFolderName + "jquery.ui.theme.css",
cssFiles = grunt.config.get( "concat.css.src" )[ 1 ].slice();

grunt.file.write( cssFileName, cssContent );

// get css components, replace the last file with the current theme
cssFiles.splice(-1);
cssFiles.push( "<strip_all_banners:" + cssFileName + ">" );
grunt.config.get( "concat" )[ concatTarget ] = {
src: [ "<banner:meta.bannerCSS>", cssFiles ],
dest: cssFolderName + "jquery-ui.css"
};
grunt.task.run( "concat:" + concatTarget );

theme.fetchImages(function( err, files ) {
if ( err ) {
done( err );
return;
}
files.forEach(function( file ) {
grunt.file.write( cssFolderName + "images/" + file.path, file.data );
});
done();
});
}, function( err ) {
if ( err ) {
grunt.log.error( err );
}
done( !err );
});
});

grunt.registerTask( "clean", function() {
require( "rimraf" ).sync( "dist" );
});

};
};
@@ -3,7 +3,7 @@ module.exports = function( grunt ) {

var versions = {
"git": "git",
"1.8": "1.8.0",
"1.8": "1.8.0 1.8.1 1.8.2",
"1.7": "1.7 1.7.1 1.7.2",
"1.6": "1.6 1.6.1 1.6.2 1.6.3 1.6.4"
},
@@ -42,6 +42,7 @@ function submit( commit, tests, configFile, version, done ) {
for ( test in tests ) {
testUrls.push( testBase + tests[ test ] );
}
version = version ? ( version + " " ) : "";
testswarm({
url: config.swarmUrl,
pollInterval: 10000,
@@ -50,7 +51,7 @@ function submit( commit, tests, configFile, version, done ) {
}, {
authUsername: config.authUsername,
authToken: config.authToken,
jobName: 'jQuery UI ' + version + '<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 7 ) + '</a>',
jobName: 'jQuery UI ' + version + '#<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
runMax: config.runMax,
"runNames[]": Object.keys(tests),
"runUrls[]": testUrls,
@@ -74,7 +75,7 @@ grunt.registerTask( "testswarm-multi-jquery", function( commit, configFile, mino
allTests[ test + "-" + version ] = tests[ test ] + "?nojshint=true&jquery=" + version;
}
});
submit( commit, allTests, configFile, minor + " core ", this.async() );
submit( commit, allTests, configFile, minor + " core", this.async() );
});

};
@@ -1,10 +1,10 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>jQuery UI Accordion - Collapse content</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.8.0.js"></script>
<script src="../../jquery-1.8.2.js"></script>
<script src="../../ui/jquery.ui.core.js"></script>
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.accordion.js"></script>
@@ -19,8 +19,6 @@
</head>
<body>

<div class="demo">

<div id="accordion">
<h3>Section 1</h3>
<div>
@@ -45,13 +43,8 @@ <h3>Section 4</h3>
</div>
</div>

</div><!-- End demo -->



<div class="demo-description">
<p>By default, accordions always keep one section open. To allow for all sections to be be collapsible, set the <code>collapsible</code> option to true. Click on the currently open section to collapse its content pane.</p>
</div><!-- End demo-description -->

</div>
</body>
</html>

0 comments on commit cca4e77

Please sign in to comment.
You can’t perform that action at this time.