web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-16 11:37:29 +02:00
Code Releases Activity

Merge pull request #458 from gkatsev/lockShowing

Browse Source 
Make lockShowing apply a css class instead of modifying styles directly....
This commit is contained in:
Steve Heffernan 2013-04-25 12:29:28 -07:00
commit 623bb75267
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/css/video-js.css
View File

@ -102,6 +102,12 @@ body.vjs-full-window {
/* Hide disabled or unsupported controls */ /* Hide disabled or unsupported controls */
.vjs-default-skin .vjs-hidden { display: none; } .vjs-default-skin .vjs-hidden { display: none; }
.vjs-lock-showing {
display: block !important;
opacity: 1;
visibility: visible;
}
/* DEFAULT SKIN (override in another file to create new skins) /* DEFAULT SKIN (override in another file to create new skins)
================================================================================ ================================================================================
Instead of editing this file, I recommend creating your own skin CSS file to be included after this file, Instead of editing this file, I recommend creating your own skin CSS file to be included after this file,

10
src/js/component.js
View File

@ -545,10 +545,7 @@ vjs.Component.prototype.fadeOut = function(){
* @return {vjs.Component} * @return {vjs.Component}
*/ */
vjs.Component.prototype.lockShowing = function(){ vjs.Component.prototype.lockShowing = function(){
var style = this.el_.style; this.addClass('vjs-lock-showing');
style.display = 'block';
style.opacity = 1;
style.visibility = 'visible';
return this; return this;
}; };
@ -557,10 +554,7 @@ vjs.Component.prototype.lockShowing = function(){
* @return {vjs.Component} * @return {vjs.Component}
*/ */
vjs.Component.prototype.unlockShowing = function(){ vjs.Component.prototype.unlockShowing = function(){
var style = this.el_.style; this.removeClass('vjs-lock-showing');
style.display = '';
style.opacity = '';
style.visibility = '';
return this; return this;
}; };