Merge branch 'master' into develop

# Conflicts:
#	src/js/plyr.js
This commit is contained in:
Sam Potts
2015-04-15 21:51:59 +10:00
23 changed files with 1697 additions and 1467 deletions

View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v1.1.4
// plyr.js v1.1.5
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@ -541,6 +541,8 @@
switch (this.prefix) {
case "":
return document.fullscreenElement == element;
case "moz":
return document.mozFullScreenElement == element;
default:
return document[this.prefix + "FullscreenElement"] == element;
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff