Merge branch 'master' of github.com:uxebu/bonsai into shape-classes

CHANGELOG

@@ -1,4 +1,8 @@
-v0.2.1 / 2012-07-12
+v0.2.2
+-------------------
+
+
+v0.2.1 / 2012-07-20
 -------------------
 
 * Aligned callback usage to use node-style single-callbacks. See https://github.com/uxebu/bonsai/pull/1

package.json

@@ -3,10 +3,10 @@
   "name": "bonsai",
   "description": "Bonsai runtime and node server",
   "main": "src/bootstrapper/_dev/node.js",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "private": true,
   "homepage": "https://github.com/uxebu/bonsai/",
-  "maintainers" : [],
+  "maintainers": [],
   "repository": {
     "type": "git",
     "url": "git@github.com:uxebu/bonsai.git"

src/runner/animation/animation.js

@@ -495,7 +495,7 @@ define([
           fromValues,
           key,
           to,
-          attrStrategy = strategy === 'attr',
+          isAttrStrategy,
           hasTranslations = !!this.translations.length,
           easingFunc = this.easing,
           endValues = this.properties,
@@ -514,8 +514,10 @@ define([
         fromValues = subjects[s].values;
         subject = subjects[s].subject;
         strategy = subjects[s].strategy;
+        isAttrStrategy = strategy === 'attr'
 
         var subjectAttributes = subject._attributes;
+        var subjectMutatedAttributes = subject._mutatedAttributes;
 
         // loop through all properties and calculate the value
         for (var p = 0; p < pl; ++p) {
@@ -524,15 +526,16 @@ define([
           from = fromValues[key];
           to = endValues[key];
 
-          if (!hasTranslations && attrStrategy) {
+          if (!hasTranslations && isAttrStrategy) {
             // Optimal method (no translations):
             subjectAttributes[key] = from + (to - from) * progress;
+            subjectMutatedAttributes[key] = true;
           } else {
             values[key] = from + (to - from) * progress;
           }
         }
 
-        if (!hasTranslations && attrStrategy) {
+        if (!hasTranslations && isAttrStrategy) {
           // We've already set them the optimal way. Continue:
           subject.markUpdate();
           continue;

src/runner/animation/keyframe_animation.js

@@ -456,8 +456,8 @@ define([
         key = keys[i];
         frame =
           key == +key ? key : // numerical comparision: frame number
-          key == 'from' ? 0 : // 'from' keyword --> 0
-          key == 'to' ? duration :
+          /^(?:from|start)$/.test(key) ? 0 : // 'from' keyword --> 0
+          /^(?:to|end)$/.test(key) ? duration :
           /^\d+%$/.test(key) ? duration * parseFloat(key) / 100 :
           clock.toFrameNumber(key); // everything else
         keyframesClean[frame] = keyframes[key];