diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 5 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 22 |
2 files changed, 0 insertions, 27 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 5c957619..9e2bacd5 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -34,8 +34,6 @@ | |||
34 | "container_layers" : {"#" : "container-layers"}, | 34 | "container_layers" : {"#" : "container-layers"}, |
35 | "container_tracks" : {"#" : "container-tracks"}, | 35 | "container_tracks" : {"#" : "container-tracks"}, |
36 | "timeline_disabler" : {"#" : "timeline-disabler"}, | 36 | "timeline_disabler" : {"#" : "timeline-disabler"}, |
37 | "checkable_relative" : {"#" : "checkable_relative"}, | ||
38 | "checkable_absolute" : {"#" : "checkable_absolute"}, | ||
39 | "checkable_animated" : {"#" : "checkable_animated"}, | 37 | "checkable_animated" : {"#" : "checkable_animated"}, |
40 | "tl_configbutton" : {"#" : "tl-configbutton"} | 38 | "tl_configbutton" : {"#" : "tl-configbutton"} |
41 | } | 39 | } |
@@ -179,9 +177,6 @@ | |||
179 | <div class="layer-master">Master Layer | 177 | <div class="layer-master">Master Layer |
180 | <div class="tl-configbutton" data-montage-id="tl-configbutton"> | 178 | <div class="tl-configbutton" data-montage-id="tl-configbutton"> |
181 | <div class="tl-dropdown"> | 179 | <div class="tl-dropdown"> |
182 | <div class="checkable" data-montage-id="checkable_relative">Use relative positioning</div> | ||
183 | <div class="checkable checked" data-montage-id="checkable_absolute">Use absolute positioning</div> | ||
184 | <div class="nj-divider divider-horizontal"></div> | ||
185 | <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div> | 180 | <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div> |
186 | </div> | 181 | </div> |
187 | </div> | 182 | </div> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 7f8d421d..509ec7b1 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -483,8 +483,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
483 | 483 | ||
484 | // Bind the handlers for the config menu | 484 | // Bind the handlers for the config menu |
485 | this.checkable_animated.addEventListener("click", this.handleAnimatedClick.bind(this), false); | 485 | this.checkable_animated.addEventListener("click", this.handleAnimatedClick.bind(this), false); |
486 | this.checkable_relative.addEventListener("click", this.handleRelativeClick.bind(this), false); | ||
487 | this.checkable_absolute.addEventListener("click", this.handleAbsoluteClick.bind(this), false); | ||
488 | this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false); | 486 | this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false); |
489 | document.addEventListener("click", this.handleDocumentClick.bind(this), false); | 487 | document.addEventListener("click", this.handleDocumentClick.bind(this), false); |
490 | 488 | ||
@@ -732,8 +730,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
732 | 730 | ||
733 | // Bind the handlers for the config menu | 731 | // Bind the handlers for the config menu |
734 | this.checkable_animated.addEventListener("click", this.handleAnimatedClick.bind(this), false); | 732 | this.checkable_animated.addEventListener("click", this.handleAnimatedClick.bind(this), false); |
735 | this.checkable_relative.addEventListener("click", this.handleRelativeClick.bind(this), false); | ||
736 | this.checkable_absolute.addEventListener("click", this.handleAbsoluteClick.bind(this), false); | ||
737 | this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false); | 733 | this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false); |
738 | document.addEventListener("click", this.handleDocumentClick.bind(this), false); | 734 | document.addEventListener("click", this.handleDocumentClick.bind(this), false); |
739 | 735 | ||
@@ -1592,24 +1588,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1592 | 1588 | ||
1593 | } | 1589 | } |
1594 | }, | 1590 | }, |
1595 | handleRelativeClick: { | ||
1596 | value: function(event) { | ||
1597 | if (!event.currentTarget.classList.contains("checked")) { | ||
1598 | this.handleCheckableClick(event); | ||
1599 | } | ||
1600 | this.checkable_absolute.classList.remove("checked"); | ||
1601 | this.useAbsolutePosition = false; | ||
1602 | } | ||
1603 | }, | ||
1604 | handleAbsoluteClick: { | ||
1605 | value: function(event) { | ||
1606 | if (!event.currentTarget.classList.contains("checked")) { | ||
1607 | this.handleCheckableClick(event); | ||
1608 | } | ||
1609 | this.checkable_relative.classList.remove("checked"); | ||
1610 | this.useAbsolutePosition = true; | ||
1611 | } | ||
1612 | }, | ||
1613 | handleCheckableClick: { | 1591 | handleCheckableClick: { |
1614 | value: function(event) { | 1592 | value: function(event) { |
1615 | if (event.currentTarget.classList.contains("checked")) { | 1593 | if (event.currentTarget.classList.contains("checked")) { |