diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index ff8d0bad..6dcbf74b 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -167,36 +167,36 @@ var Tween = exports.Tween = Montage.create(Component, {
},
_isDragging: {
- value: false
+ value: false
},
isDragging: {
- serializable: true,
+ serializable: true,
get:function () {
return this._isDragging;
},
set:function (newVal) {
this._isDragging = newVal;
}
-
+
},
_easing: {
- value: "none"
+ value: "none"
},
easing: {
- serializable: true,
+ serializable: true,
get:function () {
return this._easing;
},
set:function (newVal) {
this._easing = newVal;
}
-
+
},
draw:{
value:function () {
- this.tweenspan.element.style.width = this.spanWidth + "px";
+ this.tweenspan.element.style.width = this.spanWidth + "px";
this.keyframe.element.style.left = (this.spanWidth -5) + "px";
this.tweenspan.spanWidth = this.spanWidth;
this.element.style.left = this.spanPosition + "px";
@@ -225,7 +225,7 @@ var Tween = exports.Tween = Montage.create(Component, {
handleElementChange:{
value:function (event) {
// temp - testing var
- var useAbsolute = true;
+ var useAbsolute = true;
if(event.detail.type === "cssChange"){
event.detail.source="cssPanelChange"
@@ -250,32 +250,32 @@ var Tween = exports.Tween = Montage.create(Component, {
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";
- }
- if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){
- this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft + "px";
- }
- if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){
- this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth + "px";
- }
- 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;
- }
-
- if (eventDetail.source === "translateTool") {
- var arrMat = eventDetail.data.value[0].properties.mat,
- strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")";
-
- this.tweenedProperties["-webkit-transform"] = strTweenProperty;
- this.parentComponent.parentComponent.updateKeyframeRule();
- this.isTweenAnimated = true;
- }
+ 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";
+ }
+ if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){
+ this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft + "px";
+ }
+ if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){
+ this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth + "px";
+ }
+ 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;
+ }
+
+ if (eventDetail.source === "translateTool") {
+ var arrMat = eventDetail.data.value[0].properties.mat,
+ strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")";
+
+ this.tweenedProperties["-webkit-transform"] = strTweenProperty;
+ this.parentComponent.parentComponent.updateKeyframeRule();
+ this.isTweenAnimated = true;
+ }
}
},
--
cgit v1.2.3
From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:53:10 -0700
Subject: Remove trailing spaces
---
js/panels/Timeline/Tween.reel/Tween.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'js/panels/Timeline/Tween.reel')
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 6dcbf74b..c451caa7 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -165,7 +165,7 @@ var Tween = exports.Tween = Montage.create(Component, {
this._isTweenAnimated = value;
}
},
-
+
_isDragging: {
value: false
},
@@ -177,9 +177,9 @@ var Tween = exports.Tween = Montage.create(Component, {
set:function (newVal) {
this._isDragging = newVal;
}
-
+
},
-
+
_easing: {
value: "none"
},
@@ -191,7 +191,7 @@ var Tween = exports.Tween = Montage.create(Component, {
set:function (newVal) {
this._easing = newVal;
}
-
+
},
draw:{
@@ -267,11 +267,11 @@ var Tween = exports.Tween = Montage.create(Component, {
this.parentComponent.parentComponent.updateKeyframeRule();
this.isTweenAnimated = true;
}
-
+
if (eventDetail.source === "translateTool") {
var arrMat = eventDetail.data.value[0].properties.mat,
strTweenProperty = "perspective(1400) matrix3d(" + arrMat.join() + ")";
-
+
this.tweenedProperties["-webkit-transform"] = strTweenProperty;
this.parentComponent.parentComponent.updateKeyframeRule();
this.isTweenAnimated = true;
--
cgit v1.2.3
From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 12:42:16 -0700
Subject: Remove trailing spaces
---
js/panels/Timeline/Tween.reel/Tween.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/Tween.reel')
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index 0510e73e..0b797f61 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
"tweenspan": {"@": "span"}
}
},
-
+
"span": {
"prototype": "js/panels/Timeline/Span.reel",
"properties": {
--
cgit v1.2.3
From 9461e7731f91dd03a15b0a62667e722a60c84721 Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 12:44:57 -0700
Subject: Remove byte order markers (BOM)
---
js/panels/Timeline/Tween.reel/Tween.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/Tween.reel')
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index 0b797f61..b061f43e 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -1,4 +1,4 @@
-
+