diff options
author | Valerio Virgillito | 2012-06-26 09:14:30 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-26 09:14:30 -0700 |
commit | b4ca7c50790381bddeebb417c1d0477344c77cff (patch) | |
tree | 0c8d536cb0e75ceaf757b9ae2e7b5df85fc8556c /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
parent | d2e88bb251efb29f13911942f1f91101715c727e (diff) | |
parent | 8b46c251664a45039db355075bce85ddfd345269 (diff) | |
download | ninja-b4ca7c50790381bddeebb417c1d0477344c77cff.tar.gz |
Merge pull request #335 from imix23ways/Timeline-bugfix1
Timeline fix - reopen Position and Size keyframe correctly
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 2cbd9e2b..53a3b299 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -869,12 +869,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
869 | this.checkable_lock.addEventListener("click",this.handleLockLayerClick.bind(this),false); | 869 | this.checkable_lock.addEventListener("click",this.handleLockLayerClick.bind(this),false); |
870 | this.checkable_visible.addEventListener("click",this.handleLayerVisibleClick.bind(this),false); | 870 | this.checkable_visible.addEventListener("click",this.handleLayerVisibleClick.bind(this),false); |
871 | 871 | ||
872 | // Bind some bindings | ||
873 | Object.defineBinding(this, "currentSelectedContainer", { | ||
874 | boundObject:this.application.ninja, | ||
875 | boundObjectPropertyPath:"currentSelectedContainer", | ||
876 | oneway:true | ||
877 | }); | ||
878 | this.addPropertyChangeListener("currentDocument.model.domContainer", this); | 872 | this.addPropertyChangeListener("currentDocument.model.domContainer", this); |
879 | 873 | ||
880 | // Start the panel out in disabled mode by default | 874 | // Start the panel out in disabled mode by default |
@@ -1034,17 +1028,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1034 | }, | 1028 | }, |
1035 | 1029 | ||
1036 | handleKeyframeShortcut:{ | 1030 | handleKeyframeShortcut:{ |
1037 | value:function(){ | 1031 | value:function(action){ |
1038 | //console.log(this.currentLayersSelected); | ||
1039 | //console.log(this.trackRepetition); | ||
1040 | var tempEv = {}; | 1032 | var tempEv = {}; |
1041 | tempEv.offsetX = this.playheadmarker.offsetLeft; | 1033 | tempEv.offsetX = this.playheadmarker.offsetLeft; |
1034 | tempEv.actionType = action; | ||
1042 | if (typeof(this.trackRepetition.childComponents[this.currentLayersSelected[0]]) !== "undefined") { | 1035 | if (typeof(this.trackRepetition.childComponents[this.currentLayersSelected[0]]) !== "undefined") { |
1043 | this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv); | 1036 | this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv); |
1044 | } else { | 1037 | } else { |
1045 | // oops, we do not have a layer selected. We should growl at the user. For now, this will fail silently. | 1038 | // oops, we do not have a layer selected. We should growl at the user. For now, this will fail silently. |
1046 | } | 1039 | } |
1047 | |||
1048 | } | 1040 | } |
1049 | }, | 1041 | }, |
1050 | 1042 | ||