Syncs Cubelet and KeyframeFormView states.

580 · Aug 14, 2013 · 6182821 · 6182821
1 parent 5f991e0
commit 6182821
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/ui/crosshair.js b/src/ui/crosshair.js
@@ -69,6 +69,13 @@ define(['src/app', 'src/constants', 'src/utils'],
         'left': this.model.get('x') + 'px'
         ,'top': this.model.get('y') + 'px'
       });
+      var rotationCoords = this._$cubelet.cubeletGetCoords();
+      this._$cubelet.cubeletSetCoords({
+        'x': this.model.get('rX')
+        ,'y': this.model.get('rY')
+        ,'z': this.model.get('rZ')
+      });
+      this._$cubelet.cubeletApplyRotationToElement(this._$crosshairContainer);
     }
 
     ,'updateModel': function () {

diff --git a/src/ui/keyframe-form.js b/src/ui/keyframe-form.js
@@ -194,6 +194,9 @@ define([
     ,'render': function () {
       this.renderHeader();
 
+      // Yikes!
+      //
+      // TODO: Make this less repetitive.
       if (this.model.get('x') !== parseFloat(this.$inputX.val())) {
         this.incrementerViewX.$el.val(this.model.get('x'));
       }
@@ -221,7 +224,8 @@ define([
       var rXEasing = this.easeSelectViewRX.$el.val();
       var rYEasing = this.easeSelectViewRY.$el.val();
       var rZEasing = this.easeSelectViewRZ.$el.val();
-      var newEasingString = [xEasing, yEasing, rXEasing, rYEasing, rZEasing].join(' ');
+      var newEasingString = [
+          xEasing, yEasing, rXEasing, rYEasing, rZEasing].join(' ');
 
       this.model.setEasingString(newEasingString);