diff options
author | Valerio Virgillito | 2012-04-20 16:37:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-20 16:37:47 -0700 |
commit | c62273126004f057de40ce91ecda5606643f4c92 (patch) | |
tree | 4f55b7017e3387b90ae57fa71222706bd0ebec66 /js/ninja.reel | |
parent | c0bb9d7740a0fa2efce6c53c39054a46da4b63e0 (diff) | |
download | ninja-c62273126004f057de40ce91ecda5606643f4c92.tar.gz |
reverting old template to current working status. New template work.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.js | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 9b5081dd..2fedd71d 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -10,6 +10,7 @@ var Montage = require("montage/core/core").Montage, | |||
10 | AppData = require("js/data/appdata").AppData; | 10 | AppData = require("js/data/appdata").AppData; |
11 | 11 | ||
12 | var matrix = require("js/lib/math/matrix"); | 12 | var matrix = require("js/lib/math/matrix"); |
13 | var NjUtils = require("js/lib/NJUtils").NJUtils; | ||
13 | 14 | ||
14 | exports.Ninja = Montage.create(Component, { | 15 | exports.Ninja = Montage.create(Component, { |
15 | 16 | ||
@@ -143,6 +144,7 @@ exports.Ninja = Montage.create(Component, { | |||
143 | value: function() { | 144 | value: function() { |
144 | this.ninjaVersion = window.ninjaVersion.ninja.version; | 145 | this.ninjaVersion = window.ninjaVersion.ninja.version; |
145 | this.undoManager = document.application.undoManager = UndoManager.create(); | 146 | this.undoManager = document.application.undoManager = UndoManager.create(); |
147 | document.application.njUtils = NjUtils; | ||
146 | } | 148 | } |
147 | }, | 149 | }, |
148 | 150 | ||
@@ -187,28 +189,18 @@ exports.Ninja = Montage.create(Component, { | |||
187 | 189 | ||
188 | willDraw: { | 190 | willDraw: { |
189 | value: function() { | 191 | value: function() { |
190 | |||
191 | } | 192 | } |
192 | }, | 193 | }, |
193 | 194 | ||
194 | draw: { | 195 | draw: { |
195 | value: function() { | 196 | value: function() { |
196 | if(this.isResizing) { | 197 | if(this.isResizing) { |
197 | if (this.height - this._resizedHeight < 46) { | 198 | this.timelineSplitter.collapsed = this.height - this._resizedHeight < 46; |
198 | this.timelineSplitter.collapsed = true; | 199 | this.panelSplitter.collapsed = this.width - this._resizedWidth < 30; |
199 | } else { | ||
200 | this.timelineSplitter.collapsed = false; | ||
201 | } | ||
202 | |||
203 | if (this.width - this._resizedWidth < 30) { | ||
204 | this.panelSplitter.collapsed = true; | ||
205 | } else { | ||
206 | this.panelSplitter.collapsed = false; | ||
207 | } | ||
208 | |||
209 | } | 200 | } |
210 | this.rightPanelContainer.style.width = (this.width - this._resizedWidth) + "px"; | 201 | |
211 | this.timeline.element.style.height = (this.height - this._resizedHeight) + "px"; | 202 | this.rightPanelContainer.style.width = (this.width - this._resizedWidth) + "px"; |
203 | this.timeline.element.style.height = (this.height - this._resizedHeight) + "px"; | ||
212 | } | 204 | } |
213 | }, | 205 | }, |
214 | 206 | ||