diff options
author | Jon Reid | 2012-02-07 18:44:06 -0800 |
---|---|---|
committer | Jon Reid | 2012-02-07 18:44:06 -0800 |
commit | ad81fc7e75225d24ffaf59bb179a32aa12f5141a (patch) | |
tree | 5666374f64a16fe83b6d6d627f77d041341be51f /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
parent | e247f0c9bd596f0aeba6f6239ea9bd4178f5d50d (diff) | |
download | ninja-ad81fc7e75225d24ffaf59bb179a32aa12f5141a.tar.gz |
Timeline: select/deselect layers. Work on focus/blur for layers.
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 9ed69f4a..1785f888 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -14,6 +14,7 @@ | |||
14 | "element": {"#": "timeline_panel"}, | 14 | "element": {"#": "timeline_panel"}, |
15 | "user_layers": {"#": "user_layers"}, | 15 | "user_layers": {"#": "user_layers"}, |
16 | "track_container": {"#": "right_inside"}, | 16 | "track_container": {"#": "right_inside"}, |
17 | "timeline_leftpane" : {"#" : "timeline_leftpane"}, | ||
17 | "layer_tracks": {"#": "layer_tracks"}, | 18 | "layer_tracks": {"#": "layer_tracks"}, |
18 | "master_track": {"#": "master_track"}, | 19 | "master_track": {"#": "master_track"}, |
19 | "newlayer_button": {"#": "newlayer_button"}, | 20 | "newlayer_button": {"#": "newlayer_button"}, |
@@ -92,6 +93,11 @@ | |||
92 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", | 93 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", |
93 | "oneway" : false | 94 | "oneway" : false |
94 | }, | 95 | }, |
96 | "isSelected" : { | ||
97 | "boundObject" : {"@" : "repetition1"}, | ||
98 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected", | ||
99 | "oneway" : false | ||
100 | }, | ||
95 | "isStyleCollapsed" : { | 101 | "isStyleCollapsed" : { |
96 | "boundObject" : {"@" : "repetition1"}, | 102 | "boundObject" : {"@" : "repetition1"}, |
97 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", | 103 | "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", |
@@ -167,7 +173,7 @@ | |||
167 | <div id="main_timeline" class="maintimeline"> | 173 | <div id="main_timeline" class="maintimeline"> |
168 | 174 | ||
169 | 175 | ||
170 | <div id="timeline_leftpane" class="tl_leftpane"> | 176 | <div id="timeline_leftpane" class="tl_leftpane" tabindex="-1"> |
171 | <div id="leftpane_inside" class="leftinside"> | 177 | <div id="leftpane_inside" class="leftinside"> |
172 | <div id="timeline_controller" class="timelinecontroller"> | 178 | <div id="timeline_controller" class="timelinecontroller"> |
173 | <div id="timeline_controls" class="timelinecontrols"> | 179 | <div id="timeline_controls" class="timelinecontrols"> |