diff --git a/Gruntfile.js b/Gruntfile.js index a39d8b754..59cb7325b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -192,7 +192,7 @@ module.exports = function(grunt) { // Copy over other files // grunt.file.copy('src/css/video-js.png', 'build/files/video-js.png'); - grunt.file.copy('src/swf/video-js.swf', 'build/files/video-js.swf'); + grunt.file.copy('node_modules/videojs-swf/dist/video-js.swf', 'build/files/video-js.swf'); // Inject version number into css file var css = grunt.file.read('build/files/video-js.css'); @@ -275,7 +275,7 @@ module.exports = function(grunt) { grunt.file.copy('build/files/combined.video.js', 'dist/video-js/video.dev.js'); grunt.file.copy('build/files/video-js.css', 'dist/video-js/video-js.css'); grunt.file.copy('build/files/video-js.min.css', 'dist/video-js/video-js.min.css'); - grunt.file.copy('build/files/video-js.swf', 'dist/video-js/video-js.swf'); + grunt.file.copy('node_modules/videojs-swf/dist/video-js.swf', 'dist/video-js/video-js.swf'); grunt.file.copy('build/demo-files/demo.html', 'dist/video-js/demo.html'); grunt.file.copy('build/demo-files/demo.captions.vtt', 'dist/video-js/demo.captions.vtt'); @@ -291,7 +291,7 @@ module.exports = function(grunt) { // Minified version only, doesn't need demo files grunt.file.copy('build/files/minified.video.js', 'dist/cdn/video.js'); grunt.file.copy('build/files/video-js.min.css', 'dist/cdn/video-js.css'); - grunt.file.copy('build/files/video-js.swf', 'dist/cdn/video-js.swf'); + grunt.file.copy('node_modules/videojs-swf/dist/video-js.swf', 'dist/cdn/video-js.swf'); grunt.file.copy('build/demo-files/demo.captions.vtt', 'dist/cdn/demo.captions.vtt'); grunt.file.copy('build/demo-files/demo.html', 'dist/cdn/demo.html'); diff --git a/package.json b/package.json index c9e080866..5b976a24d 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,7 @@ "description": "An HTML5 and Flash video player with a common API and skin for both.", "version": "4.3.0", "copyright": "Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE", - "keywords": [ - "html5", - "flash", - "video", - "player" - ], + "keywords": ["html5", "flash", "video", "player"], "homepage": "http://videojs.com", "author": "Steve Heffernan", "scripts": { @@ -18,6 +13,9 @@ "type": "git", "url": "https://github.com/zencoder/video-js.git" }, + "dependencies": { + "videojs-swf": "4.3.4" + }, "devDependencies": { "grunt-cli": "~0.1.0", "grunt": "~0.4.0", @@ -38,22 +36,5 @@ "karma-qunit": "~0.0.2", "videojs-doc-generator": "0.0.1", "qunitjs": "~1.12.0" - }, - "testling": { - "browsers": [ - "ie6", - "ie7", - "ie8", - "ie9", - "firefox/15", - "chrome/22", - "opera/12", - "safari/5.1" - ], - "harness": "mocha-qunit", - "scripts": [ - "src/js/*.js", - "test/unit/*.js" - ] } } diff --git a/sandbox/index.html.example b/sandbox/index.html.example index 3eb5e3f86..31ee5f62d 100644 --- a/sandbox/index.html.example +++ b/sandbox/index.html.example @@ -11,7 +11,7 @@ diff --git a/src/swf/video-js.swf b/src/swf/video-js.swf deleted file mode 100644 index eef460add..000000000 Binary files a/src/swf/video-js.swf and /dev/null differ