Skip to content

Commit 6584d56

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents a2dddad + 4806309 commit 6584d56

19 files changed

+5378
-2490
lines changed

.gitmodules

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "test/web-platform-tests"]
2-
path = test/web-platform-tests
3-
url = https://github.com/alancutter/web-platform-tests.git
4-
branch = nativeShippingAPI
2+
path = test/web-platform-tests
3+
url = https://github.com/web-platform-tests/wpt.git

.travis-setup.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ uname -a
2626
cat /etc/lsb-release
2727

2828
npm install
29+
# npm may update the package-lock.json. Revert this to avoid failing grunt-checkrepo.
30+
git checkout HEAD package-lock.json
31+
2932
npm install -g grunt-cli
3033

3134
sudo apt-get update --fix-missing
@@ -62,19 +65,19 @@ Chrome)
6265
sudo dpkg --install $CHROME || sudo apt-get -f install
6366
which google-chrome
6467
ls -l `which google-chrome`
65-
68+
6669
if [ -f /opt/google/chrome/chrome-sandbox ]; then
6770
export CHROME_SANDBOX=/opt/google/chrome/chrome-sandbox
6871
else
6972
export CHROME_SANDBOX=$(ls /opt/google/chrome*/chrome-sandbox)
7073
fi
71-
74+
7275
# Download a custom chrome-sandbox which works inside OpenVC containers (used on travis).
7376
sudo rm -f $CHROME_SANDBOX
7477
sudo wget https://googledrive.com/host/0B5VlNZ_Rvdw6NTJoZDBSVy1ZdkE -O $CHROME_SANDBOX
7578
sudo chown root:root $CHROME_SANDBOX; sudo chmod 4755 $CHROME_SANDBOX
7679
sudo md5sum $CHROME_SANDBOX
77-
80+
7881
google-chrome --version
7982
;;
8083

.travis.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1+
dist: xenial
2+
services: xvfb
13
language: node_js
2-
3-
node_js:
4-
- "6.10.2"
5-
6-
install:
7-
- BROWSER="Firefox-stable" ./.travis-setup.sh
8-
9-
before_script:
10-
- export DISPLAY=:99.0
11-
- sh -e /etc/init.d/xvfb start
4+
node_js: "10.15.3"
5+
install: BROWSER="Firefox-stable" ./.travis-setup.sh
6+
script: xvfb-run -a npm test

CONTRIBUTING.md

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ Example: `http://localhost:9876/base/test/web-platform-tests/web-animations/anim
4545

4646
## Publishing a release
4747

48+
1. Clone a fresh copy of [web-animations-js](https://github.com/web-animations/web-animations-js).
49+
50+
1. Make sure you are on the `dev` branch.
51+
52+
```sh
53+
git checkout dev
54+
```
55+
4856
1. Determine the version number for the release
4957

5058
* Increment the first number and reset others to 0 when there are large breaking changes
@@ -70,8 +78,14 @@ Example: `http://localhost:9876/base/test/web-platform-tests/web-animations/anim
7078

7179
1. Build the polyfill with `npm install && grunt` then update `docs/experimental.md`'s Build Target Comparison with the current gzipped sizes.
7280
73-
1. Commit the above changes to web-animations-js/dev and merge to
74-
web-animations-js/master.
81+
1. Commit and push the above changes to web-animations-js/dev.
82+
83+
```sh
84+
# Create a commit with above changes
85+
git push origin dev
86+
```
87+
88+
1. Merge to local master branch:
7589
7690
```sh
7791
git checkout master
@@ -85,14 +99,17 @@ Example: `http://localhost:9876/base/test/web-platform-tests/web-animations/anim
8599
grunt
86100
# Optional "grunt test" to make sure everything still passes.
87101
git add -f *.min.js{,.map}
88-
git rm .gitignore
102+
git rm --ignore-unmatch .gitignore
89103
git commit -m 'Add build artifacts from '`cat .git/refs/heads/dev`
90-
git push HEAD:refs/heads/master
104+
git push origin master
91105
```
92106
93-
1. Draft a [new release](https://github.com/web-animations/web-animations-js/releases) at the
94-
commit pushed to web-animations-js in step #4. Copy the release notes from `History.md`
95-
added in step #2.
107+
1. Draft a [new release](https://github.com/web-animations/web-animations-js/releases).
108+
109+
* For the **tag version**, put the new version number of this release.
110+
* For the **target**, select "master".
111+
* For the **title**, look at previous releases for examples.
112+
* For the **description**, copy the release notes from `History.md` added in step #2.
96113
97114
1. Once you've pushed to web-animations-js, run `npm publish` from that checked-out folder
98115

Gruntfile.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = function(grunt) {
5656
var record = config.uglify[target];
5757
record.options.sourceMapIn = source + '.map';
5858
record.options.banner = grunt.file.read('templates/boilerplate');
59-
record.options.wrap = true;
59+
record.options.enclose = true;
6060
record.options.compress.dead_code = true;
6161
record.options.mangle = { eval: true };
6262
return name;
@@ -191,10 +191,9 @@ module.exports = function(grunt) {
191191
return new Promise(function(resolve) {
192192
var karmaConfig = require('karma/lib/config').parseConfig(require('path').resolve('test/karma-config.js'), {});
193193
configCallback(karmaConfig);
194-
var karmaServer = require('karma').server;
195-
karmaServer.start(karmaConfig, function(exitCode) {
194+
new (require('karma').Server)(karmaConfig, function(exitCode) {
196195
resolve(exitCode == 0);
197-
});
196+
}).start();
198197
});
199198
}
200199

History.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
### 2.3.2 - *June 25 2019*
2+
3+
* [Fix the wrapping IIFE of the prod bundle.](https://github.com/web-animations/web-animations-js/issues/208)
4+
* [Minor fixes for Closure compilation compatibility.](https://github.com/web-animations/web-animations-js/issues/200)
5+
* [Fixed `Cannot set property _isFinished of #<Object> which has only a getter`](https://github.com/web-animations/web-animations-js/issues/165)
6+
17
### 2.3.1 - *July 20 2017*
28

39
* Fix [https://github.com/web-animations/web-animations-js/issues/157](missing web-animations.min.js issue)
@@ -91,7 +97,7 @@
9197

9298
* Added arbitrary easing capitalisation.
9399

94-
* Added "id" effect option. (http://w3c.github.io/web-animations/#dom-keyframeanimationoptions-id)
100+
* Added "id" effect option. (https://drafts.csswg.org/web-animations/#dom-keyframeanimationoptions-id)
95101

96102
* Added "oncancel" event handler.
97103

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Documentation
4848
* [Examples of usage](/docs/examples.md)
4949
* [Live demos](https://web-animations.github.io/web-animations-demos)
5050
* [MDN reference](https://developer.mozilla.org/en-US/docs/Web/API/Element/animate)
51-
* [W3C specification](http://w3c.github.io/web-animations/)
51+
* [W3C specification](https://drafts.csswg.org/web-animations/)
5252

5353
We love feedback!
5454
-----------------

docs/examples.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ element.animate([
6969
Timing parameters
7070
-----------------
7171
- Web Animations inherits many of its timing parameters from CSS Animations.
72-
- See the [specification](http://w3c.github.io/web-animations/#animationeffecttimingreadonly) for details on each parameter.
72+
- See the [specification](https://drafts.csswg.org/web-animations/#animationeffecttimingreadonly) for details on each parameter.
7373

7474
[**Live demo**](http://jsbin.com/dabehipiyo/edit?js,output)
7575
```javascript
@@ -106,7 +106,7 @@ element.animate({
106106
Playback controls
107107
-----------------
108108
- element.animate() returns an Animation object with basic playback controls.
109-
- See the [specification](http://w3c.github.io/web-animations/#the-animation-interface) for details on each method.
109+
- See the [specification](https://drafts.csswg.org/web-animations/#the-animation-interface) for details on each method.
110110

111111
[**Live demo**](http://jsbin.com/kutaqoxejo/edit?js,output)
112112
```javascript

docs/support.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ Browser support
1313

1414
The polyfill is supported on modern versions of all major browsers, including:
1515

16-
* Chrome 55+
16+
* Chrome 56+
1717
* Firefox 27+
1818
* IE10+ (including Edge)
1919
* Safari (iOS) 7.1+
2020
* Safari (Mac) 9+
2121

22+
In particular, the polyfill requires requestAnimationFrame. If your browser does not
23+
have requestAnimationFrame, consider loading a requestAnimationFrame polyfill first
24+
([example](https://gist.githubusercontent.com/paulirish/1579671/raw/682e5c880c92b445650c4880a6bf9f3897ec1c5b/rAF.js)).
25+
2226
Native fallback
2327
---------------
2428

externs/web-animations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* @fileoverview Basic externs for the Web Animations API. This is not
2020
* nessecarily exhaustive. For more information, see the spec-
21-
* https://w3c.github.io/web-animations
21+
* https://drafts.csswg.org/web-animations/
2222
* @externs
2323
*/
2424

0 commit comments

Comments
 (0)