aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Reid2012-03-20 17:37:11 -0700
committerJon Reid2012-03-20 17:37:11 -0700
commit0e24b9dc875cefb1010a9e2b507c19b77e4d9811 (patch)
treee70cc0fcfcb93abfca0f3bbe419c2f6f4967fed7
parentaa2d8afb323e71ea562c74564609604e0480fde4 (diff)
downloadninja-0e24b9dc875cefb1010a9e2b507c19b77e4d9811.tar.gz
Timeline: fix layer and style select problems.
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js1
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js6
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html2
5 files changed, 9 insertions, 4 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 79b522ee..c8e31fad 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -301,7 +301,7 @@
301 "properties" : { 301 "properties" : {
302 "element" : {"#" : "content-style"}, 302 "element" : {"#" : "content-style"},
303 "myContent" : {"#":"content-style"}, 303 "myContent" : {"#":"content-style"},
304 "contentHeight" : 60, 304 "contentHeight" : 0,
305 "isLabelClickable" : true, 305 "isLabelClickable" : true,
306 "clicker" : {"#" : "clicker-style"}, 306 "clicker" : {"#" : "clicker-style"},
307 "isCollapsed" : true, 307 "isCollapsed" : true,
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 830d179e..9334a0b4 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -714,7 +714,6 @@ var Layer = exports.Layer = Montage.create(Component, {
714 value: function(event) { 714 value: function(event) {
715 this.layerData.isActive = true; 715 this.layerData.isActive = true;
716 var ptrParent = nj.queryParentSelector(event.target, ".content-style"); 716 var ptrParent = nj.queryParentSelector(event.target, ".content-style");
717 console.log('handleMousedown called')
718 if (ptrParent !== false) { 717 if (ptrParent !== false) {
719 this.selectStyle(this.getActiveStyleIndex()); 718 this.selectStyle(this.getActiveStyleIndex());
720 } 719 }
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 6e7d410c..2e0bf7dd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -19,7 +19,7 @@
19 "element": {"#": "timeline_panel"}, 19 "element": {"#": "timeline_panel"},
20 "user_layers": {"#": "user_layers"}, 20 "user_layers": {"#": "user_layers"},
21 "track_container": {"#": "right_inside"}, 21 "track_container": {"#": "right_inside"},
22 "timeline_leftpane" : {"#" : "timeline_leftpane"}, 22 "timeline_leftpane" : {"#" : "leftpane_inside"},
23 "layer_tracks": {"#": "layer_tracks"}, 23 "layer_tracks": {"#": "layer_tracks"},
24 "master_track": {"#": "master_track"}, 24 "master_track": {"#": "master_track"},
25 "time_markers" : {"#": "timeline_markers"}, 25 "time_markers" : {"#": "timeline_markers"},
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index df018ee3..67eae45c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -913,6 +913,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
913 } else { 913 } else {
914 this.arrLayers[i].layerData.isSelected = false; 914 this.arrLayers[i].layerData.isSelected = false;
915 } 915 }
916
917 if (this.arrLayers[i].layerData.triggerBinding === true) {
918 this.arrLayers[i].layerData.triggerBinding = false;
919 } else {
920 this.arrLayers[i].layerData.triggerBinding = true;
921 }
916 } 922 }
917 923
918 this.layerRepetition.selectedIndexes = [layerIndex]; 924 this.layerRepetition.selectedIndexes = [layerIndex];
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 7e9b8a21..2d508b3c 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -200,7 +200,7 @@
200 "properties" : { 200 "properties" : {
201 "element" : {"#" : "content-styles"}, 201 "element" : {"#" : "content-styles"},
202 "myContent" : {"#":"content-styles"}, 202 "myContent" : {"#":"content-styles"},
203 "contentHeight" : 40, 203 "contentHeight" : 0,
204 "isLabelClickable" : false, 204 "isLabelClickable" : false,
205 "clicker" : {"#" : "label-styles"}, 205 "clicker" : {"#" : "label-styles"},
206 "isCollapsed" : true, 206 "isCollapsed" : true,