Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reverting an attempted fix for YouTube controls fighting with VideoJS…

… controls. Sometimes this throws an exception on init
  • Loading branch information...
commit fe84d59ec59ea71fa7b1aa8511586757ca4c81d8 1 parent c5883b0
@jhurliman authored
Showing with 1 addition and 21 deletions.
  1. +1 −9 design/video-js.css
  2. +0 −6 src/player.js
  3. +0 −6 src/tech/youtube.js
View
10 design/video-js.css
@@ -51,14 +51,6 @@ body.vjs-full-window {
position: relative; width: 100%; max-height: 100%;
}
-/* Control Bar Style
-================================================================================
-Hide the native control bar if using the Youtube player and ytcontrols is set to true so that the native control bar
-doesn't compete with Youtube's control bar.
-*/
-.vjs-controls { display: block; }
-.vjs-controls.showYTBar { display: none !important; }
-
/* Text Track Styles */
/* Overall track holder for both captions and subtitles */
.video-js .vjs-text-track-display { text-align: center; position: absolute; bottom: 4em; left: 1em; right: 1em; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
@@ -504,4 +496,4 @@ div.vjs-loading-spinner .ball8 { opacity: 1.00; position:absolute; left: 6px; to
/* Subtitles Button */
.vjs-default-skin .vjs-captions-button div { background-position: -25px -75px; }
.vjs-default-skin .vjs-chapters-button div { background-position: -100px -75px; }
-.vjs-default-skin .vjs-chapters-button ul { width: 20em; left: -8.5em; /* Width of menu - width of button / 2 */ }
+.vjs-default-skin .vjs-chapters-button ul { width: 20em; left: -8.5em; /* Width of menu - width of button / 2 */ }
View
6 src/player.js
@@ -192,12 +192,6 @@ _V_.Player = _V_.Component.extend({
this.isReady = false;
var techReady = function(){
- // Remove this class in the event that the user switches from the Youtube player so that
- // the native control bar is visible again
- if (techName != "youtube") {
- this.player.controlBar.removeClass("showYTBar");
- }
-
this.player.triggerReady();
// Manually track progress in cases where the browser/flash player doesn't report it.
View
6 src/tech/youtube.js
@@ -85,12 +85,6 @@ _V_.youtube = _V_.PlaybackTech.extend({
_V_.youtube.updateVideoQuality(this.player, null);
- // If native YouTube controls are enabled, turn on a CSS class that hides
- // the video.js controls
- if (params.controls) {
- player.controlBar.addClass("showYTBar");
- }
-
this.loadApi();
},
Please sign in to comment.
Something went wrong with that request. Please try again.