Prep for 0.3.0

shimberger · Dec 28, 2016 · c3699ff · c3699ff
1 parent 5da813a
commit c3699ff
Show file tree

Hide file tree

Showing 3 changed files with 198 additions and 127 deletions.
diff --git a/bindata.go b/bindata.go
diff --git a/ui/src/gulpfile.js b/ui/src/gulpfile.js
@@ -41,6 +41,7 @@ gulp.task('html', function () {
 gulp.task('vendor:css', function() {
   return gulp.src([
   		'node_modules/bootstrap/dist/css/bootstrap.css',
+//      'node_modules/videojs-airplay/dist/videojs.airplay.css',
   	])
     .pipe(concat('vendor.css'))
     .pipe(gulp.dest('../build/css/'));
@@ -55,6 +56,7 @@ gulp.task('vendor:js', function() {
   		'node_modules/jquery/dist/jquery.min.js',
       'node_modules/video.js/dist/video.min.js',
       'node_modules/videojs-contrib-hls/dist/videojs-contrib-hls.min.js',
+//      'node_modules/videojs-airplay/dist/videojs.airplay.js',
       'node_modules/moment/min/moment.min.js',
   		'node_modules/bootstrap/dist/css/bootstrap.min.js',
   		'node_modules/history/umd/history.min.js',

diff --git a/ui/src/jsx/app.jsx b/ui/src/jsx/app.jsx
@@ -24,7 +24,11 @@ var Player = React.createClass({
 
 	componentDidMount() {
 		this.video = ReactDOM.findDOMNode(this._video);
-		this.player = videojs(this.video);
+		$(this.video).attr('x-webkit-airplay','allow');
+		$(this.video).attr('airplay','allow');
+		this.player = videojs(this.video,{
+			plugins: { airplayButton: {} }
+		});
 		this.player.play();
 	},