Merge branch 'patch-1' of git://github.com/H1D/videojs-resolution-switcher into H1D-patch-1

Conflicts:
	lib/videojs-resolution-switcher.js
This commit is contained in:
Kasper Moskwiak 2015-10-28 15:58:58 +01:00
commit 63bd92ffeb

View file

@ -2,7 +2,16 @@
* Copyright (c) 2015 Kasper Moskwiak
* Modified by Pierre Kraft
* Licensed under the Apache-2.0 license. */
(function(window, videojs) {
(function() {
var videojs = null;
if(typeof window.videojs === 'undefined' && typeof require === 'function') {
videojs = require('videojs');
} else {
videojs = window.videojs;
}
(function(window, videojs) {
/* jshint eqnull: true*/
'use strict';
@ -222,4 +231,5 @@
// register the plugin
videojs.plugin('videoJsResolutionSwitcher', videoJsResolutionSwitcher);
})(window, window.videojs);
})(window, videojs);
})();