Skip to content

Commit 4d05d01

Browse files
committed
Conflicts: jquery.keyframes.min.js
2 parents ad5116f + 1d21e5d commit 4d05d01

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

bower.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"homepage": "https://github.com/jQueryKeyframes/jQuery.Keyframes",
55
"license": "MIT",
66
"private": false,
7+
"main": "jquery.keyframes.js",
78
"ignore": [
89
"**/.*",
910
"node_modules",

jquery.keyframes.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
});
2323

2424

25-
var $createKeyframeStyleTag = function(id) {
26-
return $("<style>").attr({
27-
class: "keyframe-style",
25+
var $createKeyframeStyleTag = function(id, css) {
26+
return $("<style>" + css + "</style>").attr({
27+
"class": "keyframe-style",
2828
id: id,
2929
type: "text/css"
3030
}).appendTo("head");
@@ -65,7 +65,7 @@
6565
$frameStyle.append(css);
6666

6767
var $elems = $("*").filter(function() {
68-
this.style[animationString + "Name"] === frameName;
68+
return this.style[animationString + "Name"] === frameName;
6969
});
7070

7171
$elems.each(function() {
@@ -76,7 +76,7 @@
7676
});
7777
});
7878
} else {
79-
$createKeyframeStyleTag(frameName).append(css);
79+
$createKeyframeStyleTag(frameName, css);
8080
}
8181
},
8282
define: function(frameData) {
@@ -170,6 +170,6 @@
170170
return this;
171171
};
172172

173-
$createKeyframeStyleTag("boost-keyframe").append(" .boostKeyframe{" + vendorPrefix + "transform:scale3d(1,1,1);}");
173+
$createKeyframeStyleTag("boost-keyframe", " .boostKeyframe{" + vendorPrefix + "transform:scale3d(1,1,1);}");
174174

175175
}).call(this);

jquery.keyframes.min.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)