web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-12 12:16:27 +02:00
Code Releases Activity

Merge branch 'feature/grunt-swf' of git://github.com/seniorflexdeveloper/video.js into seniorflexdeveloper-feature/grunt-swf

Browse Source
This commit is contained in:
Steve Heffernan 2014-01-15 13:52:33 -05:00
commit 2825f74ba8
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -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/VideoJS.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/VideoJS.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/VideoJS.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');

3
package.json
View File

@ -37,7 +37,8 @@
"grunt-karma": "~0.4.4",
"karma-qunit": "~0.0.2",
"videojs-doc-generator": "0.0.1",
"qunitjs": "~1.12.0"
"qunitjs": "~1.12.0",
"video-js-swf": "git://github.com/videojs/video-js-swf.git#feature/grunt-build"
},
"testling": {
"browsers": [

2
sandbox/index.html.example
View File

@ -11,7 +11,7 @@
<!-- Set the location of the flash SWF -->
<script>
vjs.options.flash.swf = '../src/swf/video-js.swf'
vjs.options.flash.swf = '../node_modules/videojs-swf/dist/VideoJS.swf'
</script>
</head>

BIN
src/swf/video-js.swf
View File

Binary file not shown.