1 files changed, 56 insertions, 49 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 0d189fba..85fdfdc9 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -1,8 +1,32 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
@@ -11,6 +35,7 @@ var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 var Tween = exports.Tween = Montage.create(Component, {
 
+    // ==== Begin Models
     keyframe: {
         value: null,
         serializable: true
@@ -184,6 +209,23 @@ var Tween = exports.Tween = Montage.create(Component, {
         }
     },
 
+    setData:{
+        value:function(){
+            this.spanWidth = this.tweenData.spanWidth;
+            this.keyFramePosition = this.tweenData.keyFramePosition;
+            this.spanPosition = this.tweenData.spanPosition;
+            this.keyFrameMillisec = this.tweenData.keyFrameMillisec;
+            this.tweenID = this.tweenData.tweenID;
+            this.tweenedProperties = this.tweenData.tweenedProperties;
+            this.isTweenAnimated = this.tweenData.isTweenAnimated;
+            this.easing = this.tweenData.easing;
+            this.initSelect = this.tweenData.initSelect;
+            this.needsDraw = true;
+        }
+    },
+    // ==== End Models
+
+    // ==== Begin Draw cycle methods
     prepareForDraw:{
         value:function(){
             if(this.initSelect){
@@ -206,37 +248,19 @@ var Tween = exports.Tween = Montage.create(Component, {
             }
         }
     },
+    // ==== End Draw cycle methods
 
-    setData:{
-        value:function(){
-            this.spanWidth = this.tweenData.spanWidth;
-            this.keyFramePosition = this.tweenData.keyFramePosition;
-            this.spanPosition = this.tweenData.spanPosition;
-            this.keyFrameMillisec = this.tweenData.keyFrameMillisec;
-            this.tweenID = this.tweenData.tweenID;
-            this.tweenedProperties = this.tweenData.tweenedProperties;
-            this.isTweenAnimated = this.tweenData.isTweenAnimated;
-            this.easing = this.tweenData.easing;
-            this.initSelect = this.tweenData.initSelect;
-            this.needsDraw = true;
-        }
-    },
-
+    // ==== Begin Event handlers
     handleElementChange:{
         value:function (event) {
-            // temp - testing var
-                var useAbsolute = true;
-
             if(event.detail.type === "cssChange"){
                 event.detail.source="cssPanelChange"
             }
-
             if (event.detail.source && event.detail.source !== "tween") {
 
                 if(this.parentComponent.parentComponent.isSubproperty){
                     this.setStyleTweenProperty(event.detail);
                 } else {
-                    // check for correct element selection
                     if (this.application.ninja.selectedElements[0] != this.parentComponent.parentComponent.animatedElement) {
                         console.log("Wrong element selected for this keyframe track");
                     } else {
@@ -246,10 +270,11 @@ var Tween = exports.Tween = Montage.create(Component, {
             }
         }
     },
+    // ==== End Event handlers
 
+    // ==== Begin Controllers
     setTweenProperties:{
         value:function (eventDetail) {
-
                 if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") {
                     if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){
                         this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px";
@@ -263,7 +288,7 @@ var Tween = exports.Tween = Montage.create(Component, {
                     if (this.parentComponent.parentComponent.animatedElement.offsetHeight != this.tweenedProperties["height"]){
                         this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight + "px";
                     }
-                    // tell track to update css rule
+
                     this.parentComponent.parentComponent.updateKeyframeRule();
                     this.isTweenAnimated = true;
                 }
@@ -281,26 +306,17 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setStyleTweenProperty:{
         value:function (eventDetail) {
-            //console.log("Setting style tween properties for: " + this.parentComponent.parentComponent.trackEditorProperty);
-            //console.log(eventDetail);
             if(eventDetail.type == "setProperties"){
-                // need to ignore top, left, width, and height
-                //console.log(eventDetail.data.value[0]);
                 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
-
             } else if(eventDetail.type == "setColor"){
                 var prop = this.parentComponent.parentComponent.trackEditorProperty;
                 this.tweenedProperties[prop] = eventDetail.data.value.color.css;
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
-
             } else if(eventDetail.type == "setProperty"){
-                // need to ignore top, left, width, and height
-                //console.log(eventDetail.data.value[0]);
                 this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty] = eventDetail.data.value[0];
                 this.parentComponent.parentComponent.updatePropKeyframeRule();
-
-            }else {
+            } else {
                 console.log("TWEEN Unhandled type - setStyleTweenProperty : " + eventDetail.type);
             }
         }
@@ -308,7 +324,6 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setKeyframeEase:{
         value:function(easeType){
-            // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2)
             this.tweenedProperties["-webkit-animation-timing-function"] = easeType;
             if(this.parentComponent.parentComponent.isSubproperty){
                 if(this.parentComponent.parentComponent.trackType == "position"){
@@ -323,18 +338,13 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     selectTween:{
         value: function(){
-            // turn on event listener for element change
             this.eventManager.addEventListener("elementChange", this, false);
-
-            // select the containing layer
             var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID);
-            this.application.ninja.timeline.selectLayer(selectIndex, true);
-
-            // tell timeline to deselect all other tweens and push this one into the selectedTweens in timeline
+            // this.application.ninja.timeline.selectLayer(selectIndex, true); // deprecated
+            this.application.ninja.timeline.selectLayers([selectIndex]);
+            this.application.ninja.timeline.updateStageSelection();