diff options
author | Valerio Virgillito | 2012-02-01 23:53:47 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-02 15:33:42 -0800 |
commit | 1a8bcab85cd71447bbd1b66daf95d1c8fbca8c2b (patch) | |
tree | e1eacd90f25041a6ad7e07b32bda226bb706f022 | |
parent | 7e23cfe542f29148ed315586830785de59201f92 (diff) | |
download | ninja-1a8bcab85cd71447bbd1b66daf95d1c8fbca8c2b.tar.gz |
Fixes for montage integration
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rw-r--r-- | js/helper-classes/RDGE/GLBrushStroke.js | 1 | ||||
-rw-r--r-- | js/helper-classes/RDGE/GLSubpath.js | 1 | ||||
-rw-r--r-- | js/ninja.reel/ninja.js | 15 | ||||
-rw-r--r-- | js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js index 89292ad8..e3b14bf7 100644 --- a/js/helper-classes/RDGE/GLBrushStroke.js +++ b/js/helper-classes/RDGE/GLBrushStroke.js | |||
@@ -4,6 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | // Todo: This shoudl be converted to a module | ||
7 | var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 8 | var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
8 | 9 | ||
9 | 10 | ||
diff --git a/js/helper-classes/RDGE/GLSubpath.js b/js/helper-classes/RDGE/GLSubpath.js index 25b12093..55b7e49a 100644 --- a/js/helper-classes/RDGE/GLSubpath.js +++ b/js/helper-classes/RDGE/GLSubpath.js | |||
@@ -4,6 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | // Todo: This shoudl be converted to a module | ||
7 | var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 8 | var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
8 | 9 | ||
9 | 10 | ||
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 7115b228..48c72a1d 100644 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -96,9 +96,16 @@ exports.Ninja = Montage.create(Component, { | |||
96 | } | 96 | } |
97 | }, | 97 | }, |
98 | 98 | ||
99 | _didDraw: { | ||
100 | value: false | ||
101 | }, | ||
102 | |||
99 | didDraw: { | 103 | didDraw: { |
100 | value: function() { | 104 | value: function() { |
101 | NJevent("appLoaded"); | 105 | if(!this._didDraw) { |
106 | NJevent("appLoaded"); | ||
107 | this._didDraw = true; | ||
108 | } | ||
102 | } | 109 | } |
103 | }, | 110 | }, |
104 | 111 | ||
@@ -165,12 +172,6 @@ exports.Ninja = Montage.create(Component, { | |||
165 | } | 172 | } |
166 | }, | 173 | }, |
167 | 174 | ||
168 | handleLivePreview: { | ||
169 | value: function(event) { | ||
170 | |||
171 | } | ||
172 | }, | ||
173 | |||
174 | executeLivePreview: { | 175 | executeLivePreview: { |
175 | value: function() { | 176 | value: function() { |
176 | var background, overflow, transitionStopRule; | 177 | var background, overflow, transitionStopRule; |
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js index 57187af1..66333cc0 100644 --- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js +++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | |||
@@ -91,7 +91,7 @@ exports.PanelContainer = Montage.create(Component, { | |||
91 | this.panelSplitter.disabled = true; | 91 | this.panelSplitter.disabled = true; |
92 | } | 92 | } |
93 | 93 | ||
94 | this.needsDraw = true; | 94 | // this.needsDraw = true; |
95 | 95 | ||
96 | this.addEventListener("change@appModel.PropertiesPanel", this, false); | 96 | this.addEventListener("change@appModel.PropertiesPanel", this, false); |
97 | this.addEventListener("change@appModel.ProjectPanel", this, false); | 97 | this.addEventListener("change@appModel.ProjectPanel", this, false); |
@@ -198,7 +198,7 @@ exports.PanelContainer = Montage.create(Component, { | |||
198 | minHeights += this.repeater.childComponents[i].element.offsetHeight; | 198 | minHeights += this.repeater.childComponents[i].element.offsetHeight; |
199 | } else { | 199 | } else { |
200 | this._panels[i].isLocked = false; | 200 | this._panels[i].isLocked = false; |
201 | this.repeater.childComponents[i].needsDraw = true; | 201 | if(this.repeater.childComponents[i]) this.repeater.childComponents[i].needsDraw = true; |
202 | minHeights += this._panels[i].minHeight; | 202 | minHeights += this._panels[i].minHeight; |
203 | } | 203 | } |
204 | } | 204 | } |