Permalink
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also .
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
- 12 commits
- 23 files changed
- 0 comments
- 2 contributors
Commits on Mar 16, 2017
Commits on Mar 17, 2017
Commits on Mar 18, 2017
- Comment out things we don't need to see in the PR description - Change CLA link
Unified
Split
Showing
with
18,545 additions
and 86 deletions.
- +5 −1 .github/PULL_REQUEST_TEMPLATE.md
- +24 −1 build/release/dist.js
- +10,253 −0 dist/jquery.js
- +4 −0 dist/jquery.min.js
- +1 −0 dist/jquery.min.map
- +8,160 −0 dist/jquery.slim.js
- +4 −0 dist/jquery.slim.min.js
- +1 −0 dist/jquery.slim.min.map
- +2 −2 package.json
- +1 −1 src/core.js
- +6 −0 src/css.js
- +5 −0 src/css/curCSS.js
- +7 −7 src/deprecated.js
- +3 −7 src/event.js
- +3 −3 src/manipulation.js
- 0 src/{ → manipulation}/var/rcheckableType.js
- +1 −1 src/serialize.js
- +17 −11 test/{ → data}/readywait.html
- +0 −1 test/data/readywaitasset.js
- +0 −25 test/data/readywaitloader.js
- +14 −0 test/unit/dimensions.js
- +21 −26 test/unit/event.js
- +13 −0 test/unit/ready.js
| @@ -6,11 +6,15 @@ should start with an issue. Mention the issue number here. | ||
|
|
||
|
|
||
| ### Checklist ### | ||
| <!-- | ||
| Mark an `[x]` for completed items, if you're not sure leave them unchecked and we can assist. | ||
| --> | ||
|
|
||
| * [ ] All authors have signed the CLA at https://contribute.jquery.com/CLA/ | ||
| * [ ] All authors have signed the CLA at https://cla.js.foundation/jquery/jquery | ||
| * [ ] New tests have been added to show the fix or feature works | ||
| * [ ] Grunt build and unit tests pass locally with these changes | ||
| * [ ] If needed, a docs issue/PR was created at https://github.com/jquery/api.jquery.com | ||
|
|
||
| <!-- | ||
| Thanks! Bots and humans will be around shortly to check it out. | ||
| --> | ||
| @@ -49,6 +49,15 @@ module.exports = function( Release, files, complete ) { | ||
| }, null, 2 ); | ||
| } | ||
|
|
||
| /** | ||
| * Replace the version in the README | ||
| * @param {string} readme | ||
| */ | ||
| function editReadme( readme ) { | ||
| var rprev = new RegExp( Release.prevVersion, "g" ); | ||
| return readme.replace( rprev, Release.newVersion ); | ||
| } | ||
|
|
||
| /** | ||
| * Copy necessary files over to the dist repo | ||
| */ | ||
| @@ -57,6 +66,7 @@ module.exports = function( Release, files, complete ) { | ||
| // Copy dist files | ||
| var distFolder = Release.dir.dist + "/dist", | ||
| externalFolder = Release.dir.dist + "/external", | ||
| readme = fs.readFileSync( Release.dir.dist + "/README.md", "utf8" ), | ||
| rmIgnore = files | ||
| .concat( [ | ||
| "README.md", | ||
| @@ -93,8 +103,17 @@ module.exports = function( Release, files, complete ) { | ||
| // Write generated bower file | ||
| fs.writeFileSync( Release.dir.dist + "/bower.json", generateBower() ); | ||
|
|
||
| console.log( "Adding files to dist..." ); | ||
| fs.writeFileSync( Release.dir.dist + "/README.md", editReadme( readme ) ); | ||
|
|
||
| console.log( "Files ready to add." ); | ||
| console.log( "Edit the dist README.md to include the latest blog post link." ); | ||
| } | ||
|
|
||
| /** | ||
| * Add, commit, and tag the dist files | ||
| */ | ||
| function commit() { | ||
| console.log( "Adding files to dist..." ); | ||
| Release.exec( "git add -A", "Error adding files." ); | ||
| Release.exec( | ||
| "git commit -m \"Release " + Release.newVersion + "\"", | ||
| @@ -130,6 +149,10 @@ module.exports = function( Release, files, complete ) { | ||
| copy, | ||
| Release.confirmReview, | ||
|
|
||
| Release._section( "Add, commit, and tag files in distribution repo" ), | ||
| commit, | ||
| Release.confirmReview, | ||
|
|
||
| Release._section( "Pushing files to distribution repo" ), | ||
| push | ||
| ], complete ); | ||
Oops, something went wrong.