web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-03-31 22:22:09 +02:00
Code Releases Activity

Merge branch 'hotfix/player-externs' of git://github.com/dmlap/video-js into dmlap-hotfix/player-externs

Browse Source 
Conflicts:
	Gruntfile.js
This commit is contained in:
Steve Heffernan 2013-12-02 17:29:34 -08:00
commit c23ca5200c
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@ -52,12 +52,12 @@ module.exports = function(grunt) {
minify: { minify: {
source:{ source:{
src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js'], src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js'],
externs: ['src/js/media/flash.externs.js'], externs: ['src/js/player.externs.js', 'src/js/media/flash.externs.js'],
dest: 'build/files/minified.video.js' dest: 'build/files/minified.video.js'
}, },
tests: { tests: {
src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js', 'test/unit/*.js', '!test/unit/api.js'], src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js', 'test/unit/*.js', '!test/unit/api.js'],
externs: ['src/js/media/flash.externs.js', 'test/qunit-externs.js'], externs: ['src/js/player.externs.js', 'src/js/media/flash.externs.js', 'test/qunit-externs.js'],
dest: 'build/files/test.minified.video.js' dest: 'build/files/test.minified.video.js'
} }
}, },

11
src/js/player.externs.js Normal file
View File

@ -0,0 +1,11 @@
/**
* @fileoverview Externs for videojs.Player. Externs are functions that the
* compiler shouldn't obfuscate.
*/
/**
* Fullscreen functionality
*/
videojs.Player.prototype.isFullScreen = undefined;
videojs.Player.prototype.requestFullScreen = function(){};
videojs.Player.prototype.cancelFullScreen = function(){};

32
test/unit/api.js
View File

@ -94,7 +94,7 @@ test('should be able to initialize player twice on the same tag using string ref
player.dispose(); player.dispose();
}); });
test('videojs.players should be availble after minification', function() { test('videojs.players should be available after minification', function() {
var videoTag = PlayerTest.makeTag(); var videoTag = PlayerTest.makeTag();
var id = videoTag.id; var id = videoTag.id;
@ -106,3 +106,33 @@ test('videojs.players should be availble after minification', function() {
player.dispose(); player.dispose();
}); });
test('fullscreenToggle does not depend on minified player methods', function(){
var noop, player, fullscreen, requestFullScreen, cancelFullScreen;
noop = function(){};
requestFullScreen = false;
cancelFullScreen = false;
player = {
id: noop,
on: noop,
ready: noop
};
player['requestFullScreen'] = function(){
requestFullScreen = true;
};
player['cancelFullScreen'] = function(){
cancelFullScreen = true;
};
player['isFullScreen'] = false;
fullscreen = new videojs.FullscreenToggle(player);
fullscreen.trigger('click');
ok(requestFullScreen, 'requestFullScreen called');
player.isFullScreen = true;
fullscreen.trigger('click');
ok(cancelFullScreen, 'cancelFullScreen called');
});