web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-31 11:26:45 +02:00
Code Releases Activity

Merge pull request #449 from eXon/master

Browse Source 
Let external libs use the extend
This commit is contained in:
Steve Heffernan 2013-04-22 11:20:50 -07:00
commit ea792587d5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/js/core-object.js
View File

@ -22,7 +22,8 @@ vjs.CoreObject.extend = function(props){
props = props || {}; props = props || {};
// Set up the constructor using the supplied init method // Set up the constructor using the supplied init method
// or using the init of the parent object // 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 // In Resig's simple class inheritance (previously used) the constructor
// is a function that calls `this.init.apply(arguments)` // is a function that calls `this.init.apply(arguments)`
// However that would prevent us from using `ParentObject.call(this);` // However that would prevent us from using `ParentObject.call(this);`

3
src/js/setup.js
View File

@ -58,4 +58,5 @@ vjs.one(window, 'load', function(){
}); });
// Run Auto-load players // 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);