Merge branch 'master' of github.com:selz/plyr

# Conflicts:
#	dist/plyr.js
This commit is contained in:
Sam Potts
2016-02-13 22:19:31 +11:00
3 changed files with 30 additions and 16 deletions

View File

@ -11,17 +11,17 @@
'use strict';
/*global define,module*/
if (typeof define === 'function' && define.amd) {
// AMD
define(null, function() { factory(root, document) });
} else if (typeof module === 'object') {
if (typeof module === 'object' && typeof module.exports === 'object') {
// Node, CommonJS-like
module.exports = factory(root, document);
} else if (typeof define === 'function' && define.amd) {
// AMD
define(null, function() { factory(root, document) });
} else {
// Browser globals (root is window)
root.plyr = factory(root, document);
}
}(this, function(window, document) {
}(typeof window !== 'undefined' ? window : this, function(window, document) {
'use strict';
/*global YT,$f*/