Permalink
Browse files

Fixed a bug where animating to 0 would not work for rotation and scale.

  • Loading branch information...
koenbok committed Oct 16, 2013
1 parent 1d8cf24 commit 25a47ebb2c46c34814b397f4025d75bc3b9899cf
Showing with 7 additions and 7 deletions.
  1. +4 −4 build/framer.js
  2. +3 −3 src/animation.coffee
@@ -1,7 +1,7 @@
// Framer 2.0-39-g4a289c5 (c) 2013 Koen Bok
// Framer 2.0-41-g1d8cf24 (c) 2013 Koen Bok
// https://github.com/koenbok/Framer
window.FramerVersion = "2.0-39-g4a289c5";
window.FramerVersion = "2.0-41-g1d8cf24";
(function(){var require = function (file, cwd) {
@@ -4103,11 +4103,11 @@ require.define("/src/animation.coffee",function(require,module,exports,__dirname
this.totalTime = (this.curveValues.length / this.precision) * 1000;
propertiesA = this.view.properties;
propertiesB = this.properties;
if (propertiesB.scale) {
if (propertiesB.hasOwnProperty("scale")) {
propertiesB.scaleX = propertiesB.scale;
propertiesB.scaleY = propertiesB.scale;
}
if (propertiesB.rotation) {
if (propertiesB.hasOwnProperty("rotation")) {
propertiesB.rotationZ = propertiesB.rotation;
}
this.propertiesA = {};
@@ -130,13 +130,13 @@ class Animation extends EventEmitter
propertiesB = @properties
# Set the derived properties scale and rotation
if propertiesB.scale
if propertiesB.hasOwnProperty "scale"
propertiesB.scaleX = propertiesB.scale
propertiesB.scaleY = propertiesB.scale
if propertiesB.rotation
if propertiesB.hasOwnProperty "rotation"
propertiesB.rotationZ = propertiesB.rotation
@propertiesA = {}
@propertiesB = {}

0 comments on commit 25a47eb

Please sign in to comment.