ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' into beta-with-ads

Browse Source 
# Conflicts:
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	dist/plyr.js
#	dist/plyr.js.map
This commit is contained in:
Sam Potts 2018-01-19 14:28:39 +11:00
commit 98dd818bf6
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -126,8 +126,8 @@ const build = {
gulp.task(name, () => gulp.task(name, () =>
gulp gulp
.src(bundles[bundle].js[key]) .src(bundles[bundle].js[key])
.pipe(concat(key))
.pipe(sourcemaps.init()) .pipe(sourcemaps.init())
.pipe(concat(key))
.pipe( .pipe(
rollup( rollup(
{ {

4
package.json
View File

@ -39,12 +39,12 @@
"run-sequence": "^2.2.1", "run-sequence": "^2.2.1",
"stylelint": "^8.4.0", "stylelint": "^8.4.0",
"stylelint-config-prettier": "^2.0.0", "stylelint-config-prettier": "^2.0.0",
"stylelint-config-sass-guidelines": "^4.0.1", "stylelint-config-sass-guidelines": "^4.1.0",
"stylelint-config-standard": "^18.0.0", "stylelint-config-standard": "^18.0.0",
"stylelint-order": "^0.8.0", "stylelint-order": "^0.8.0",
"stylelint-scss": "^2.2.0", "stylelint-scss": "^2.2.0",
"stylelint-selector-bem-pattern": "^2.0.0", "stylelint-selector-bem-pattern": "^2.0.0",
"uglify-es": "^3.3.5" "uglify-es": "^3.3.7"
}, },
"keywords": ["HTML5 Video", "HTML5 Audio", "Media Player", "DASH", "Shaka", "WordPress", "HLS"], "keywords": ["HTML5 Video", "HTML5 Audio", "Media Player", "DASH", "Shaka", "WordPress", "HLS"],
"repository": { "repository": {

4
src/js/controls.js vendored
View File

@ -845,11 +845,11 @@ const controls = {
container.style.height = ''; container.style.height = '';
// Only listen once // Only listen once
utils.off(container, utils.transitionEnd, restore); utils.off(container, utils.transitionEndEvent, restore);
}; };
// Listen for the transition finishing and restore auto height/width // Listen for the transition finishing and restore auto height/width
utils.on(container, utils.transitionEnd, restore); utils.on(container, utils.transitionEndEvent, restore);
// Set dimensions to target // Set dimensions to target
container.style.width = `${size.width}px`; container.style.width = `${size.width}px`;

2
src/js/support.js
View File

@ -151,7 +151,7 @@ const support = {
touch: 'ontouchstart' in document.documentElement, touch: 'ontouchstart' in document.documentElement,
// Detect transitions support // Detect transitions support
transitions: utils.transitionEnd !== false, transitions: utils.transitionEndEvent !== false,
// Reduced motion iOS & MacOS setting // Reduced motion iOS & MacOS setting
// https://webkit.org/blog/7551/responsive-design-for-motion/ // https://webkit.org/blog/7551/responsive-design-for-motion/

6
src/js/utils.js
View File

@ -731,7 +731,7 @@ const utils = {
}, },
// Get the transition end event // Get the transition end event
transitionEnd: (() => { get transitionEndEvent() {
const element = document.createElement('span'); const element = document.createElement('span');
const events = { const events = {
@ -743,8 +743,8 @@ const utils = {
const type = Object.keys(events).find(event => element.style[event] !== undefined); const type = Object.keys(events).find(event => element.style[event] !== undefined);
return typeof type === 'string' ? type : false; return utils.is.string(type) ? events[type] : false;
})(), },
// Force repaint of element // Force repaint of element
repaint(element) { repaint(element) {