aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html4
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js5
2 files changed, 7 insertions, 2 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 0062affe..ae1489ec 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -305,6 +305,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
305 _scrollTracks: { 305 _scrollTracks: {
306 value: false 306 value: false
307 }, 307 },
308 useAbsolutePosition:{
309 value:true
310 },
308 /* === END: Models === */ 311 /* === END: Models === */
309 /* === BEGIN: Draw cycle === */ 312 /* === BEGIN: Draw cycle === */
310 prepareForDraw:{ 313 prepareForDraw:{
@@ -1213,6 +1216,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1213 } 1216 }
1214 this.checkable_absolute.classList.remove("checked"); 1217 this.checkable_absolute.classList.remove("checked");
1215 // TODO: Use relative positioning 1218 // TODO: Use relative positioning
1219 this.useAbsolutePosition = false;
1216 } 1220 }
1217 }, 1221 },
1218 handleAbsoluteClick: { 1222 handleAbsoluteClick: {
@@ -1222,6 +1226,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1222 } 1226 }
1223 this.checkable_relative.classList.remove("checked"); 1227 this.checkable_relative.classList.remove("checked");
1224 // TODO: Use absolute positioning. 1228 // TODO: Use absolute positioning.
1229 this.useAbsolutePosition = true;
1225 } 1230 }
1226 }, 1231 },
1227 handleCheckableClick: { 1232 handleCheckableClick: {