Merge branch 'beta' into beta-with-ads

# 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
5 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -731,7 +731,7 @@ const utils = {
},
// Get the transition end event
transitionEnd: (() => {
get transitionEndEvent() {
const element = document.createElement('span');
const events = {
@@ -743,8 +743,8 @@ const utils = {
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
repaint(element) {