Skip to content

Commit ad5116f

Browse files
committed
add "complete" functionality to play
1 parent a882897 commit ad5116f

3 files changed

Lines changed: 22 additions & 13 deletions

File tree

example/index.html

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@
5959
delay: 0,
6060
iterationCount: 'infinite',
6161
direction: 'normal',
62-
fillMode: 'forwards'
63-
}, increment);
62+
fillMode: 'forwards',
63+
complete: increment
64+
});
6465

6566
break;
6667
case 'spin':
@@ -76,8 +77,9 @@
7677
name: 'ball-roll',
7778
duration: "3s",
7879
timingFunction: 'linear',
79-
iterationCount: 'infinite'
80-
}, increment);
80+
iterationCount: 'infinite',
81+
complete: increment
82+
});
8183

8284
break;
8385
case 'delay':
@@ -88,8 +90,9 @@
8890
duration: "3s",
8991
timingFunction: 'linear',
9092
delay: "3s",
91-
iterationCount: 'infinite'
92-
}, increment);
93+
iterationCount: 'infinite',
94+
complete: increment
95+
});
9396

9497
break;
9598
case 'once':
@@ -98,8 +101,9 @@
98101
$('.ball').playKeyframe({
99102
name: 'ball-roll',
100103
duration: "3s",
101-
timingFunction: 'ease'
102-
}, increment);
104+
timingFunction: 'ease',
105+
complete: increment
106+
});
103107

104108
break;
105109
case 'multi':
@@ -111,8 +115,9 @@
111115
duration: "3s",
112116
timingFunction: 'ease',
113117
iterationCount: 1
114-
}
115-
], increment);
118+
},
119+
increment
120+
]);
116121
}
117122
})
118123

jquery.keyframes.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
var css = "@" + vendorPrefix + "keyframes " + frameName + " {";
4343

4444
for (var key in frameData) {
45-
if (key !== "name" && key !== "media") {
45+
if (key !== "name" && key !== "media" && key !== "complete") {
4646
css += key + " {";
4747

4848
for (var property in frameData[key]) {
@@ -111,7 +111,7 @@
111111
};
112112

113113
$.fn.playKeyframe = function(frameOptions, callback) {
114-
114+
115115
var animObjToStr = function(obj){
116116
obj = $.extend({
117117
duration: '0s',
@@ -145,6 +145,10 @@
145145
var animationkey = vendorPrefix + "animation";
146146
var pfx = ["webkit", "moz", "MS", "o", ""];
147147

148+
if(!callback && frameOptions.complete){
149+
callback = frameOptions.complete;
150+
}
151+
148152
var _prefixEvent = function(element, type, callback) {
149153
for(var i = 0; i < pfx.length; i++){
150154
if (!pfx[i]) {

jquery.keyframes.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)