Added back missing deprecated fullscreen functions, and fixed a warni…

…ng from using a deprecated method internally. fixes #1451
videojs · Sep 5, 2014 · 5abff36 · 5abff36
1 parent 18be3ef
commit 5abff36
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/js/exports.js b/src/js/exports.js
@@ -77,6 +77,9 @@ goog.exportProperty(vjs.Player.prototype, 'preload', vjs.Player.prototype.preloa
 goog.exportProperty(vjs.Player.prototype, 'remainingTime', vjs.Player.prototype.remainingTime);
 goog.exportProperty(vjs.Player.prototype, 'supportsFullScreen', vjs.Player.prototype.supportsFullScreen);
 goog.exportProperty(vjs.Player.prototype, 'currentType', vjs.Player.prototype.currentType);
+goog.exportProperty(vjs.Player.prototype, 'requestFullScreen', vjs.Player.prototype.currentType);
+goog.exportProperty(vjs.Player.prototype, 'cancelFullScreen', vjs.Player.prototype.currentType);
+goog.exportProperty(vjs.Player.prototype, 'isFullScreen', vjs.Player.prototype.currentType);
 
 goog.exportSymbol('videojs.MediaLoader', vjs.MediaLoader);
 goog.exportSymbol('videojs.TextTrackDisplay', vjs.TextTrackDisplay);

diff --git a/src/js/tracks.js b/src/js/tracks.js
@@ -313,7 +313,7 @@ vjs.TextTrack.prototype.mode = function(){
  * and restore it to its normal size when not in fullscreen mode.
  */
 vjs.TextTrack.prototype.adjustFontSize = function(){
-    if (this.player_.isFullScreen()) {
+    if (this.player_.isFullscreen()) {
         // Scale the font by the same factor as increasing the video width to the full screen window width.
         // Additionally, multiply that factor by 1.4, which is the default font size for
         // the caption track (from the CSS)

diff --git a/test/unit/api.js b/test/unit/api.js
@@ -48,6 +48,11 @@ test('should be able to access expected player API methods', function() {
   ok(player.usingNativeControls, 'usingNativeControls exists');
   ok(player.isFullscreen, 'isFullscreen exists');
 
+  // Deprecated methods that should still exist
+  ok(player.requestFullScreen, 'requestFullScreen exists');
+  ok(player.isFullScreen, 'isFullScreen exists');
+  ok(player.cancelFullScreen, 'cancelFullScreen exists');
+
   player.dispose();
 });
 

diff --git a/test/unit/player.js b/test/unit/player.js
@@ -284,14 +284,14 @@ test('should set controls and trigger events', function() {
 //   var player = PlayerTest.makePlayer();
 //   player.on('fullscreenchange', function(){
 //     ok(true, 'fullscreenchange event fired');
-//     ok(this.isFullScreen() === true, 'isFullScreen is true');
+//     ok(this.isFullscreen() === true, 'isFullscreen is true');
 //     ok(this.el().className.indexOf('vjs-fullscreen') !== -1, 'vjs-fullscreen class added');
 
 //     player.dispose();
 //     start();
 //   });
 
-//   player.requestFullScreen();
+//   player.requestFullscreen();
 // });
 
 test('should toggle user the user state between active and inactive', function(){