acbf7927 by David LaPalomento

Merge pull request #10 from seniorflexdeveloper/master

Repo Updates towards Beta
2 parents fbbcf562 f3816fe4
......@@ -33,7 +33,7 @@ module.exports = function(grunt) {
'src/m3u8/m3u8-parser.js'
],
dest: 'dist/videojs.hls.js'
},
}
},
uglify: {
options: {
......@@ -42,7 +42,7 @@ module.exports = function(grunt) {
dist: {
src: '<%= concat.dist.dest %>',
dest: 'dist/videojs.hls.min.js'
},
}
},
qunit: {
files: ['test/**/*.html', '!test/perf.html']
......@@ -68,7 +68,13 @@ module.exports = function(grunt) {
'!test/tsSegment.js',
'!test/fixtures/*.js',
'!test/manifest/**']
}
},
connect: {
dev: {
port: 8000,
base: '.'
}
},
watch: {
gruntfile: {
......@@ -82,8 +88,8 @@ module.exports = function(grunt) {
test: {
files: '<%= jshint.test.src %>',
tasks: ['jshint:test', 'qunit']
},
},
}
}
});
// These plugins provide necessary tasks.
......@@ -93,6 +99,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.registerTask('manifests-to-js', 'Wrap the test fixtures and output' +
' so they can be loaded in a browser',
......
......@@ -45,7 +45,7 @@
type="application/x-mpegURL">
</video>
<script>
videojs.options.flash.swf = 'node_modules/video.js/dist/video-js/video-js.swf';
videojs.options.flash.swf = 'node_modules/videojs-swf/dist/video-js.swf';
// initialize the player
var player = videojs('video');
......
......@@ -4,9 +4,14 @@
"engines": {
"node": ">= 0.8.0"
},
"repository": {
"type": "git",
"url": "git@github.com:videojs/videojs-contrib-hls.git"
},
"license": "Apache 2",
"scripts": {
"test": "grunt"
"test": "grunt",
"postinstall": "echo 'fire post install' && cd node_modules/video.js/ && npm install && grunt"
},
"devDependencies": {
"grunt-contrib-jshint": "~0.6.0",
......@@ -15,10 +20,12 @@
"grunt-contrib-uglify": "~0.2.0",
"grunt-contrib-watch": "~0.4.0",
"grunt-contrib-clean": "~0.4.0",
"grunt-contrib-connect": "~0.6.0",
"grunt": "~0.4.1"
},
"dependencies": {
"video.js": "git+https://github.com/dmlap/video-js.git#v4.3.0-10",
"video.js": "git+https://github.com/videojs/video.js.git",
"videojs-swf": "git+https://github.com/seniorflexdeveloper/video-js-swf.git",
"videojs-contrib-media-sources": "git+https://github.com/dmlap/videojs-contrib-media-sources.git#hotfix/misc-fixes"
}
}
......