aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/selection-controller.js2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js5
3 files changed, 3 insertions, 6 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 154fb7f8..195eea6c 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -90,7 +90,7 @@ exports.SelectionController = Montage.create(Component, {
90 } 90 }
91 }, 91 },
92 92
93 handleSwitchDocument: { 93 handleSwitchDocument: {
94 value: function() { 94 value: function() {
95 if(this.application.ninja.documentController.activeDocument.currentView === "design"){ 95 if(this.application.ninja.documentController.activeDocument.currentView === "design"){
96 this._selectedItems = this.application.ninja.selectedElements.slice(0); 96 this._selectedItems = this.application.ninja.selectedElements.slice(0);
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 1afb9e5a..1875c740 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -859,7 +859,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
859 this.currentLayerSelected.layerData.elementsList.splice(length, 1); 859 this.currentLayerSelected.layerData.elementsList.splice(length, 1);
860 break; 860 break;
861 } 861 }
862 length--; 862 //length--;
863 } 863 }
864 } 864 }
865 }, 865 },
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 77c0dfa8..2b308d9a 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -44,7 +44,6 @@ var Tween = exports.Tween = Montage.create(Component, {
44 }, 44 },
45 set: function(value){ 45 set: function(value){
46 this._spanWidth = value; 46 this._spanWidth = value;
47 this.needsDraw = true;
48 } 47 }
49 }, 48 },
50 49
@@ -59,7 +58,6 @@ var Tween = exports.Tween = Montage.create(Component, {
59 }, 58 },
60 set:function (value) { 59 set:function (value) {
61 this._spanPosition = value; 60 this._spanPosition = value;
62 this.needsDraw = true;
63 } 61 }
64 }, 62 },
65 63
@@ -74,7 +72,6 @@ var Tween = exports.Tween = Montage.create(Component, {
74 }, 72 },
75 set:function (value) { 73 set:function (value) {
76 this._keyFramePosition = value; 74 this._keyFramePosition = value;
77 this.needsDraw = true;
78 } 75 }
79 }, 76 },
80 77
@@ -133,7 +130,6 @@ var Tween = exports.Tween = Montage.create(Component, {
133 }, 130 },
134 set:function (value) { 131 set:function (value) {
135 this._isTweenAnimated = value; 132 this._isTweenAnimated = value;
136 this.needsDraw = true;
137 } 133 }
138 }, 134 },
139 135
@@ -157,6 +153,7 @@ var Tween = exports.Tween = Montage.create(Component, {
157 this.tweenID = this.tweenData.tweenID; 153 this.tweenID = this.tweenData.tweenID;
158 this.tweenedProperties = this.tweenData.tweenedProperties; 154 this.tweenedProperties = this.tweenData.tweenedProperties;
159 this.isTweenAnimated = this.tweenData.isTweenAnimated; 155 this.isTweenAnimated = this.tweenData.isTweenAnimated;
156 this.needsDraw = true;
160 } 157 }
161 }, 158 },
162 159