Merge pull request mediaelement#708 from rickharris/master

Align timing of captions with show/hide controls.
rexblack · Jan 23, 2013 · ff4d0d3 · ff4d0d3
2 parents d8141cf + ec326b8
commit ff4d0d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/js/mep-feature-tracks.js b/src/js/mep-feature-tracks.js
@@ -73,12 +73,12 @@
 			if (!player.options.alwaysShowControls) {
 				// move with controls
 				player.container
-					.bind('mouseenter', function () {
+					.bind('controlsshown', function () {
 						// push captions above controls
 						player.container.find('.mejs-captions-position').addClass('mejs-captions-position-hover');
 
 					})
-					.bind('mouseleave', function () {
+					.bind('controlshidden', function () {
 						if (!media.paused) {
 							// move back to normal place
 							player.container.find('.mejs-captions-position').removeClass('mejs-captions-position-hover');

diff --git a/src/js/mep-player.js b/src/js/mep-player.js
@@ -338,6 +338,9 @@
 
 			// create MediaElement shim
 			mejs.MediaElement(t.$media[0], meOptions);
+
+			// controls are shown when loaded
+			t.container.trigger('controlsshown');
 		},
 
 		showControls: function(doAnimation) {
@@ -351,7 +354,10 @@
 			if (doAnimation) {
 				t.controls
 					.css('visibility','visible')
-					.stop(true, true).fadeIn(200, function() {t.controlsAreVisible = true;});	
+					.stop(true, true).fadeIn(200, function() {
+					      t.controlsAreVisible = true;
+					      t.container.trigger('controlsshown');
+					});
 
 				// any additional controls people might add and want to hide
 				t.container.find('.mejs-control')
@@ -369,6 +375,7 @@
 					.css('display','block');
 
 				t.controlsAreVisible = true;
+				t.container.trigger('controlsshown');
 			}
 
 			t.setControlsSize();
@@ -391,6 +398,7 @@
 						.css('display','block');
 
 					t.controlsAreVisible = false;
+					t.container.trigger('controlshidden');
 				});	
 
 				// any additional controls people might add and want to hide
@@ -412,6 +420,7 @@
 					.css('display','block');
 
 				t.controlsAreVisible = false;
+				t.container.trigger('controlshidden');
 			}
 		},