mirror of
https://github.com/videojs/video.js.git
synced 2025-01-17 10:46:00 +02:00
Merge pull request #449 from eXon/master
Let external libs use the extend
This commit is contained in:
commit
ea792587d5
@ -22,7 +22,8 @@ vjs.CoreObject.extend = function(props){
|
||||
props = props || {};
|
||||
// Set up the constructor using the supplied init method
|
||||
// or using the init of the parent object
|
||||
init = props.init || this.prototype.init || function(){};
|
||||
// Make sure to check the unobfuscated version for external libs
|
||||
init = props['init'] || props.init || this.prototype['init'] || this.prototype.init || function(){};
|
||||
// In Resig's simple class inheritance (previously used) the constructor
|
||||
// is a function that calls `this.init.apply(arguments)`
|
||||
// However that would prevent us from using `ParentObject.call(this);`
|
||||
|
@ -58,4 +58,5 @@ vjs.one(window, 'load', function(){
|
||||
});
|
||||
|
||||
// Run Auto-load players
|
||||
vjs.autoSetup();
|
||||
// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
|
||||
vjs.autoSetupTimeout(1);
|
||||
|
Loading…
Reference in New Issue
Block a user