diff options
author | Kruti Shah | 2012-06-22 10:00:53 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-22 10:00:53 -0700 |
commit | 4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (patch) | |
tree | 743ea0d3a3af9cae65d5af531a6dba1951b03b33 /js/panels | |
parent | cb9fbfeba90b5b76d3f3f2b9303129ca4651e5be (diff) | |
parent | 020ad879a627c4234a8732f05e175ad69cedf180 (diff) | |
download | ninja-4bf8e4cdc179c3b388fc06f26008808aa4b77eb0.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels')
5 files changed, 62 insertions, 2131 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 2cbd9e2b..1c023fdb 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1034,17 +1034,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1034 | }, | 1034 | }, |
1035 | 1035 | ||
1036 | handleKeyframeShortcut:{ | 1036 | handleKeyframeShortcut:{ |
1037 | value:function(){ | 1037 | value:function(action){ |
1038 | //console.log(this.currentLayersSelected); | ||
1039 | //console.log(this.trackRepetition); | ||
1040 | var tempEv = {}; | 1038 | var tempEv = {}; |
1041 | tempEv.offsetX = this.playheadmarker.offsetLeft; | 1039 | tempEv.offsetX = this.playheadmarker.offsetLeft; |
1040 | tempEv.actionType = action; | ||
1042 | if (typeof(this.trackRepetition.childComponents[this.currentLayersSelected[0]]) !== "undefined") { | 1041 | if (typeof(this.trackRepetition.childComponents[this.currentLayersSelected[0]]) !== "undefined") { |
1043 | this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv); | 1042 | this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv); |
1044 | } else { | 1043 | } else { |
1045 | // oops, we do not have a layer selected. We should growl at the user. For now, this will fail silently. | 1044 | // oops, we do not have a layer selected. We should growl at the user. For now, this will fail silently. |
1046 | } | 1045 | } |
1047 | |||
1048 | } | 1046 | } |
1049 | }, | 1047 | }, |
1050 | 1048 | ||
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js.orig b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js.orig deleted file mode 100644 index 59263fc3..00000000 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js.orig +++ /dev/null | |||
@@ -1,2115 +0,0 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | var Montage = require("montage/core/core").Montage, | ||
8 | Component = require("montage/ui/component").Component, | ||
9 | nj = require("js/lib/NJUtils").NJUtils, | ||
10 | EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu; | ||
11 | |||
12 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | ||
13 | |||
14 | user_layers: { | ||
15 | value: null, | ||
16 | serializable: true | ||
17 | }, | ||
18 | |||
19 | track_container: { | ||
20 | value: null, | ||
21 | serializable: true | ||
22 | }, | ||
23 | |||
24 | timeline_leftpane: { | ||
25 | value: null, | ||
26 | serializable: true | ||
27 | }, | ||
28 | |||
29 | layer_tracks: { | ||
30 | value: null, | ||
31 | serializable: true | ||
32 | }, | ||
33 | |||
34 | master_track: { | ||
35 | value: null, | ||
36 | serializable: true | ||
37 | }, | ||
38 | |||
39 | time_markers: { | ||
40 | value: null, | ||
41 | serializable: true | ||
42 | }, | ||
43 | |||
44 | playhead: { | ||
45 | value: null, | ||
46 | serializable: true | ||
47 | }, | ||
48 | |||
49 | playheadmarker: { | ||
50 | value: null, | ||
51 | serializable: true | ||
52 | }, | ||
53 | |||
54 | timetext: { | ||
55 | value: null, | ||
56 | serializable: true | ||
57 | }, | ||
58 | |||
59 | timebar: { | ||
60 | value: null, | ||
61 | serializable: true | ||
62 | }, | ||
63 | |||
64 | container_tracks: { | ||
65 | value: null, | ||
66 | serializable: true | ||
67 | }, | ||
68 | |||
69 | end_hottext: { | ||
70 | value: null, | ||
71 | serializable: true | ||
72 | }, | ||
73 | |||
74 | container_layers: { | ||
75 | value: null, | ||
76 | serializable: true | ||
77 | }, | ||
78 | |||
79 | timeline_disabler: { | ||
80 | value: null, | ||
81 | serializable: true | ||
82 | }, | ||
83 | |||
84 | checkable_relative: { | ||
85 | value: null, | ||
86 | serializable: true | ||
87 | }, | ||
88 | |||
89 | checkable_absolute: { | ||
90 | value: null, | ||
91 | serializable: true | ||
92 | }, | ||
93 | |||
94 | checkable_animated: { | ||
95 | value: null, | ||
96 | serializable: true | ||
97 | }, | ||
98 | |||
99 | tl_configbutton: { | ||
100 | value: null, | ||
101 | serializable: true | ||
102 | }, | ||
103 | |||
104 | |||
105 | |||
106 | /* === BEGIN: Models === */ | ||
107 | _currentDocument: { | ||
108 | value : null | ||
109 | }, | ||
110 | |||
111 | currentDocument : { | ||
112 | get : function() { | ||
113 | return this._currentDocument; | ||
114 | }, | ||
115 | set : function(value) { | ||
116 | // If it's the same document, do nothing. | ||
117 | if (value === this._currentDocument) { | ||
118 | return; | ||
119 | } | ||
120 | |||
121 | if(!this._currentDocument && value.currentView === "design") { | ||
122 | this.enablePanel(true); | ||
123 | } | ||
124 | |||
125 | this._currentDocument = value; | ||
126 | |||
127 | if(!value) { | ||
128 | this._boolCacheArrays = false; | ||
129 | this.clearTimelinePanel(); | ||
130 | this._boolCacheArrays = true; | ||
131 | this.enablePanel(false); | ||
132 | } else if(this._currentDocument.currentView === "design") { | ||
133 | this._boolCacheArrays = false; | ||
134 | this.clearTimelinePanel(); | ||
135 | this._boolCacheArrays = true; | ||
136 | |||
137 | // Rebind the document events for the new document context | ||
138 | this._bindDocumentEvents(); | ||
139 | |||
140 | // Initialize the timeline for the document. | ||
141 | this.initTimelineForDocument(); | ||
142 | } | ||
143 | } | ||
144 | }, | ||
145 | |||
146 | handleChange: { | ||
147 | value: function() { | ||
148 | if(this.currentDocument && this.currentDocument.model.getProperty("domContainer")) { | ||
149 | this.currentSelectedContainer = this.currentDocument.model.getProperty("domContainer"); | ||
150 | } | ||
151 | } | ||
152 | }, | ||
153 | |||
154 | _currentSelectedContainer: { | ||
155 | value: null | ||
156 | }, | ||
157 | currentSelectedContainer: { | ||
158 | get: function() { | ||
159 | return this._currentSelectedContainer; | ||
160 | }, | ||
161 | set: function(newVal) { | ||
162 | if(this._currentSelectedContainer !== newVal) { | ||
163 | this._currentSelectedContainer = newVal; | ||
164 | if (this._ignoreNextContainerChange === true) { | ||
165 | this._ignoreNextContainerChange = false; | ||
166 | return; | ||
167 | } | ||
168 | this.application.ninja.currentDocument.setLevel = true; | ||
169 | |||
170 | if(this._currentDocument.currentView === "design") { | ||
171 | this._boolCacheArrays = false; | ||
172 | this.clearTimelinePanel(); | ||
173 | this._boolCacheArrays = true; | ||
174 | |||
175 | // Rebind the document events for the new document context | ||
176 | this._bindDocumentEvents(); | ||
177 | |||
178 | // Initialize the timeline for the document. | ||
179 | this.initTimelineForDocument(); | ||
180 | } | ||