web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-24 08:42:25 +02:00
Code Releases Activity

Some organization.

Browse Source
This commit is contained in:
Steve Heffernan 2010-06-27 22:05:35 -07:00
parent 0866dbf3fa
commit 01ded669a1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video.js
View File

@ -40,8 +40,8 @@ var VideoJS = Class.extend({
controlsBelow: false, // Display control bar below video vs. on top
controlsHiding: true, // Hide controls when not over the video
defaultVolume: 0.85, // Will be overridden by localStorage volume if available
flashVersion: 9,
linksHiding: true
flashVersion: 9, // Required flash version for fallback
linksHiding: true // Hide download links when video is supported
};
// Override default options with set options
if (typeof setOptions == "object") _V_.merge(this.options, setOptions);
@ -692,8 +692,7 @@ var _V_ = {
},
merge: function(obj1, obj2){
for (attrname in obj2) { obj1[attrname] = obj2[attrname]; }
return obj1;
for(attrname in obj2){obj1[attrname]=obj2[attrname];} return obj1;
},
createElement: function(tagName, attributes){
@ -760,8 +759,6 @@ VideoJS.browserSupportsVideo = function() {
return VideoJS.videoSupport = !!document.createElement('video').canPlayType;
}
VideoJS.isIpad = function(){ return navigator.userAgent.match(/iPad/i) != null; }
VideoJS.getFlashVersion = function(){
// Cache Version
if (typeof VideoJS.flashVersion != "undefined") return VideoJS.flashVersion;
@ -784,6 +781,7 @@ VideoJS.getFlashVersion = function(){
}
VideoJS.isIE = function(){ return !+"\v1"; }
VideoJS.isIpad = function(){ return navigator.userAgent.match(/iPad/i) != null; }
// Allows for binding context to functions
// when using in event listeners and timeouts