Skip to content

Commit

Permalink
👷 build v1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
desandro committed Mar 24, 2016
1 parent 88aa207 commit 6c4e5e2
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flickity",
"version": "1.2.0",
"version": "1.2.1",
"description": "Touch, responsive, flickable galleries",
"main": [
"js/index.js",
Expand Down
2 changes: 1 addition & 1 deletion css/flickity.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Flickity v1.2.0
/*! Flickity v1.2.1
http://flickity.metafizzy.co
---------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion dist/flickity.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Flickity v1.2.0
/*! Flickity v1.2.1
http://flickity.metafizzy.co
---------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion dist/flickity.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions dist/flickity.pkgd.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Flickity PACKAGED v1.2.0
* Flickity PACKAGED v1.2.1
* Touch, responsive, flickable galleries
*
* Licensed GPLv3 for open source use
Expand Down Expand Up @@ -4302,8 +4302,8 @@ if ( 'hidden' in document ) {
// -------------------------- Player -------------------------- //

function Player( parent ) {
this.isPlaying = false;
this.parent = parent;
this.state = 'stopped';
// visibility change event handler
if ( visibilityEvent ) {
var _this = this;
Expand All @@ -4317,9 +4317,10 @@ Player.prototype = new EventEmitter();

// start play
Player.prototype.play = function() {
this.isPlaying = true;
// playing kills pauses
delete this.isPaused;
if ( this.state == 'playing' ) {
return;
}
this.state = 'playing';
// listen to visibility change
if ( visibilityEvent ) {
document.addEventListener( visibilityEvent, this.onVisibilityChange, false );
Expand All @@ -4329,26 +4330,25 @@ Player.prototype.play = function() {
};

Player.prototype.tick = function() {
// do not tick if paused or not playing
if ( !this.isPlaying || this.isPaused ) {
// do not tick if not playing
if ( this.state != 'playing' ) {
return;
}
// keep track of when .tick()
this.tickTime = new Date();

var time = this.parent.options.autoPlay;
// default to 3 seconds
time = typeof time == 'number' ? time : 3000;
var _this = this;
// HACK: reset ticks if stopped and started within interval
this.clear();
this.timeout = setTimeout( function() {
_this.parent.next( true );
_this.tick();
}, time );
};

Player.prototype.stop = function() {
this.isPlaying = false;
// stopping kills pauses
delete this.isPaused;
this.state = 'stopped';
this.clear();
// remove visibility change event
if ( visibilityEvent ) {
Expand All @@ -4361,15 +4361,15 @@ Player.prototype.clear = function() {
};

Player.prototype.pause = function() {
if ( this.isPlaying ) {
this.isPaused = true;
if ( this.state == 'playing' ) {
this.state = 'paused';
this.clear();
}
};

Player.prototype.unpause = function() {
// re-start play if in unpaused state
if ( this.isPaused ) {
if ( this.state == 'paused' ) {
this.play();
}
};
Expand Down Expand Up @@ -4763,7 +4763,7 @@ return Flickity;
}));

/*!
* Flickity v1.2.0
* Flickity v1.2.1
* Touch, responsive, flickable galleries
*
* Licensed GPLv3 for open source use
Expand Down Expand Up @@ -4807,7 +4807,7 @@ return Flickity;
});

/*!
* Flickity asNavFor v1.0.3
* Flickity asNavFor v1.0.4
* enable asNavFor for Flickity
*/

Expand Down
4 changes: 2 additions & 2 deletions dist/flickity.pkgd.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Flickity v1.2.0
* Flickity v1.2.1
* Touch, responsive, flickable galleries
*
* Licensed GPLv3 for open source use
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flickity",
"version": "1.2.0",
"version": "1.2.1",
"description": "Touch, responsive, flickable galleries",
"main": "js/index.js",
"style": "css/flickity.css",
Expand Down

0 comments on commit 6c4e5e2

Please sign in to comment.