aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/document/templates/banner/index.html1
-rwxr-xr-xjs/document/templates/html/index.html1
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js9
-rw-r--r--js/panels/Timeline/Style.reel/Style.html2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js8
5 files changed, 16 insertions, 5 deletions
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 626dc0bc..773baa03 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -21,6 +21,7 @@
21 -webkit-transition-duration: 0s !important; 21 -webkit-transition-duration: 0s !important;
22 -webkit-animation-duration: 0s !important; 22 -webkit-animation-duration: 0s !important;
23 -webkit-animation-name: none !important; 23 -webkit-animation-name: none !important;
24 -webkit-animation-fill-mode: none !important;
24 } 25 }
25 26
26 body { 27 body {
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 8fc0d82f..d7a44129 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -24,6 +24,7 @@
24 -webkit-transition-duration: 0s !important; 24 -webkit-transition-duration: 0s !important;
25 -webkit-animation-duration: 0s !important; 25 -webkit-animation-duration: 0s !important;
26 -webkit-animation-name: none !important; 26 -webkit-animation-name: none !important;
27 -webkit-animation-fill-mode: none !important;
27 } 28 }
28 29
29 body { 30 body {
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 31ba8253..72d26e78 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -470,13 +470,18 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
470 470
471 this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty; 471 this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty;
472 var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString; 472 var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString;
473 var newAnimationNames = currentAnimationNameString + "," + this.animationName; 473 var newAnimationNames = "";
474 if(currentAnimationNameString.length == 0){
475 newAnimationNames = this.animationName;
476 } else {
477 newAnimationNames = currentAnimationNameString + "," + this.animationName;
478 }
474 var currentAnimationDuration = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 479 var currentAnimationDuration = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-duration");
475 var newAnimationDuration = currentAnimationDuration + "," + currentAnimationDuration; 480 var newAnimationDuration = currentAnimationDuration + "," + currentAnimationDuration;
476 var currentIterationCount = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-iteration-count"); 481 var currentIterationCount = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-iteration-count");
477 var newIterationCount = currentIterationCount + ",1"; 482 var newIterationCount = currentIterationCount + ",1";
478 483
479 this.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames; 484 this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames;
480 485
481 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames); 486 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames);
482 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration); 487 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration);
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index f141fc1c..48ff7c8e 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -58,7 +58,7 @@
58 "value" : { 58 "value" : {
59 "boundObject" : {"@" : "owner"}, 59 "boundObject" : {"@" : "owner"},
60 "boundObjectPropertyPath" : "editorProperty", 60 "boundObjectPropertyPath" : "editorProperty",
61 "oneway" : false 61 "oneway" : true
62 } 62 }
63 } 63 }
64 } 64 }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 014d3f34..26ce526f 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1063,8 +1063,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
1063 this.tweens[0].tweenData.tweenedProperties["height"] = this.animatedElement.offsetHeight + "px"; 1063 this.tweens[0].tweenData.tweenedProperties["height"] = this.animatedElement.offsetHeight + "px";
1064 var animationDuration = Math.round(this.trackDuration / 1000) + "s"; 1064 var animationDuration = Math.round(this.trackDuration / 1000) + "s";
1065 this.animationName = this.animatedElement.classList[0] + "_PositionSize"; 1065 this.animationName = this.animatedElement.classList[0] + "_PositionSize";
1066 this.animationNamesString = this.animationName; 1066 if(this.animationNamesString.length == 0){
1067 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName); 1067 this.animationNamesString = this.animationName;
1068 } else {
1069 this.animationNamesString = this.animationName + ", " + this.animationNamesString;
1070 }
1071 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationNamesString);
1068 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration); 1072 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration);
1069 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "forwards"); 1073 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "forwards");
1070 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1); 1074 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1);