slider-pro
Advanced tools
Comparing version 1.2.3 to 1.2.5
{ | ||
"name": "slider-pro", | ||
"version": "1.2.3", | ||
"version": "1.2.5", | ||
"description": "Responsive jQuery slider, featuring modular architecture, CSS3 animations, touch swipe, animated layers, retina, lazy loading and much more.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
{ | ||
"name": "slider-pro", | ||
"description": "Responsive jQuery slider, featuring modular architecture, CSS3 animations, touch swipe, animated layers, retina, lazy loading and much more.", | ||
"version": "1.2.3", | ||
"version": "1.2.5", | ||
"homepage": "http://bqworks.com/slider-pro/", | ||
"main": "./dist/js/jquery.sliderPro.js", | ||
"author": { | ||
@@ -35,2 +36,2 @@ "name": "bqworks", | ||
"license": "MIT" | ||
} | ||
} |
@@ -12,2 +12,4 @@ // Video module for Slider Pro | ||
firstInit: false, | ||
initVideo: function() { | ||
@@ -33,2 +35,9 @@ this.on( 'update.' + NS, $.proxy( this._videoOnUpdate, this ) ); | ||
}); | ||
// call the 'gotoSlideComplete' method in case the first slide contains a video that | ||
// needs to play automatically | ||
if ( this.firstInit === false ) { | ||
this.firstInit = true; | ||
this._videoOnGotoSlideComplete({ index: this.selectedSlideIndex, previousIndex: -1 }); | ||
} | ||
}, | ||
@@ -119,4 +128,4 @@ | ||
videoAttributes, | ||
videoWidth = video.children( 'img' ).attr( 'width' ), | ||
videoHeight = video.children( 'img' ).attr( 'height'); | ||
videoWidth = video.children( 'img' ).attr( 'width' ) || video.children( 'img' ).width(), | ||
videoHeight = video.children( 'img' ).attr( 'height') || video.children( 'img' ).height(); | ||
@@ -136,3 +145,3 @@ // Check if it's a youtube or vimeo video | ||
// Get the source of the iframe that will be created | ||
src = provider === 'youtube' ? 'http://www.youtube.com/embed/' + id + '?enablejsapi=1&wmode=opaque' : 'http://player.vimeo.com/video/'+ id +'?api=1'; | ||
src = provider === 'youtube' ? '//www.youtube.com/embed/' + id + '?enablejsapi=1&wmode=opaque' : '//player.vimeo.com/video/'+ id +'?api=1'; | ||
@@ -159,3 +168,4 @@ // Get the attributes passed to the video link and then pass them to the iframe's src | ||
'class': video.attr( 'class' ), | ||
'frameborder': 0 | ||
'frameborder': 0, | ||
'allowfullscreen': 'allowfullscreen' | ||
}).insertBefore( video ); | ||
@@ -496,3 +506,3 @@ | ||
var tag = document.createElement( 'script' ); | ||
tag.src = "http://www.youtube.com/player_api"; | ||
tag.src = "//www.youtube.com/player_api"; | ||
var firstScriptTag = document.getElementsByTagName( 'script' )[0]; | ||
@@ -638,3 +648,3 @@ firstScriptTag.parentNode.insertBefore( tag, firstScriptTag ); | ||
var tag = document.createElement('script'); | ||
tag.src = "http://a.vimeocdn.com/js/froogaloop2.min.js"; | ||
tag.src = "//a.vimeocdn.com/js/froogaloop2.min.js"; | ||
var firstScriptTag = document.getElementsByTagName( 'script' )[0]; | ||
@@ -776,27 +786,46 @@ firstScriptTag.parentNode.insertBefore( tag, firstScriptTag ); | ||
this.player = this.$video[0]; | ||
this.ready = true; | ||
var checkVideoReady = setInterval(function() { | ||
if ( that.player.readyState === 4 ) { | ||
clearInterval( checkVideoReady ); | ||
this.player.addEventListener( 'play', function() { | ||
if ( that.started === false ) { | ||
that.started = true; | ||
that.trigger({ type: 'start' }); | ||
that.ready = true; | ||
that.trigger({ type: 'ready' }); | ||
that.player.addEventListener( 'play', function() { | ||
if ( that.started === false ) { | ||
that.started = true; | ||
that.trigger({ type: 'start' }); | ||
} | ||
that.state = 'playing'; | ||
that.trigger({ type: 'play' }); | ||
}); | ||
that.player.addEventListener( 'pause', function() { | ||
that.state = 'paused'; | ||
that.trigger({ type: 'pause' }); | ||
}); | ||
that.player.addEventListener( 'ended', function() { | ||
that.state = 'ended'; | ||
that.trigger({ type: 'ended' }); | ||
}); | ||
} | ||
that.state = 'playing'; | ||
that.trigger({ type: 'play' }); | ||
}); | ||
this.player.addEventListener( 'pause', function() { | ||
that.state = 'paused'; | ||
that.trigger({ type: 'pause' }); | ||
}); | ||
this.player.addEventListener( 'ended', function() { | ||
that.state = 'ended'; | ||
that.trigger({ type: 'ended' }); | ||
}); | ||
}, 100 ); | ||
}; | ||
HTML5Video.prototype.play = function() { | ||
this.player.play(); | ||
var that = this; | ||
if ( this.ready === true ) { | ||
this.player.play(); | ||
} else { | ||
var timer = setInterval(function() { | ||
if ( that.ready === true ) { | ||
clearInterval( timer ); | ||
that.player.play(); | ||
} | ||
}, 100 ); | ||
} | ||
}; | ||
@@ -803,0 +832,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
837862
14045