diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 4 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 5234b43d..1b7132b9 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -185,8 +185,8 @@ | |||
185 | <div class="layer-master">Master Layer | 185 | <div class="layer-master">Master Layer |
186 | <div class="tl-configbutton" data-montage-id="tl-configbutton"> | 186 | <div class="tl-configbutton" data-montage-id="tl-configbutton"> |
187 | <div class="tl-dropdown"> | 187 | <div class="tl-dropdown"> |
188 | <div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div> | 188 | <div class="checkable" data-montage-id="checkable_relative">Use relative positioning</div> |
189 | <div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div> | 189 | <div class="checkable checked" data-montage-id="checkable_absolute">Use absolute positioning</div> |
190 | <div class="nj-divider divider-horizontal"></div> | 190 | <div class="nj-divider divider-horizontal"></div> |
191 | <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div> | 191 | <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div> |
192 | </div> | 192 | </div> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 7ee0ca16..7fb57396 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -6,10 +6,7 @@ | |||
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | var Layer = require("js/panels/Timeline/Layer.reel").Layer; | ||
10 | var TimelineTrack = require("js/panels/Timeline/TimelineTrack.reel").TimelineTrack; | ||
11 | var nj = require("js/lib/NJUtils").NJUtils; | 9 | var nj = require("js/lib/NJUtils").NJUtils; |
12 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; | ||
13 | 10 | ||
14 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | 11 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { |
15 | 12 | ||
@@ -280,6 +277,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
280 | _scrollTracks: { | 277 | _scrollTracks: { |
281 | value: false | 278 | value: false |
282 | }, | 279 | }, |
280 | useAbsolutePosition:{ | ||
281 | value:true | ||
282 | }, | ||
283 | /* === END: Models === */ | 283 | /* === END: Models === */ |
284 | /* === BEGIN: Draw cycle === */ | 284 | /* === BEGIN: Draw cycle === */ |
285 | prepareForDraw:{ | 285 | prepareForDraw:{ |
@@ -1167,7 +1167,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1167 | this.handleCheckableClick(event); | 1167 | this.handleCheckableClick(event); |
1168 | } | 1168 | } |
1169 | this.checkable_absolute.classList.remove("checked"); | 1169 | this.checkable_absolute.classList.remove("checked"); |
1170 | // TODO: Use relative positioning | 1170 | this.useAbsolutePosition = false; |
1171 | } | 1171 | } |
1172 | }, | 1172 | }, |
1173 | handleAbsoluteClick: { | 1173 | handleAbsoluteClick: { |
@@ -1176,7 +1176,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1176 | this.handleCheckableClick(event); | 1176 | this.handleCheckableClick(event); |
1177 | } | 1177 | } |
1178 | this.checkable_relative.classList.remove("checked"); | 1178 | this.checkable_relative.classList.remove("checked"); |
1179 | // TODO: Use absolute positioning. | 1179 | this.useAbsolutePosition = true; |
1180 | } | 1180 | } |
1181 | }, | 1181 | }, |
1182 | handleCheckableClick: { | 1182 | handleCheckableClick: { |