diff options
author | Nivesh Rajbhandari | 2012-03-24 13:53:34 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-24 13:53:34 -0700 |
commit | 5e8faa47e1b2507a09d04fea4325006e5eab2f25 (patch) | |
tree | 56683c1be0485f560ff49e8125f0b19dd42199f3 /js/panels/Components | |
parent | 2946d01666ff81f913bd06d1ac1381ed42b4a010 (diff) | |
parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
download | ninja-5e8faa47e1b2507a09d04fea4325006e5eab2f25.tar.gz |
Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox
Diffstat (limited to 'js/panels/Components')
-rwxr-xr-x | js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js index 599eeda3..3505393c 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js | |||
@@ -297,6 +297,8 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
297 | styles[n] = defaultStyles[n]; | 297 | styles[n] = defaultStyles[n]; |
298 | } | 298 | } |
299 | } | 299 | } |
300 | |||
301 | instance.addEventListener('firstDraw', that, false); | ||
300 | 302 | ||
301 | that.application.ninja.currentDocument.setComponentInstance(instance, element); | 303 | that.application.ninja.currentDocument.setComponentInstance(instance, element); |
302 | 304 | ||
@@ -305,6 +307,12 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
305 | 307 | ||
306 | } | 308 | } |
307 | }, | 309 | }, |
310 | |||
311 | handleFirstDraw: { | ||
312 | value: function (e) { | ||
313 | NJevent("addComponentFirstDraw"); | ||
314 | } | ||
315 | }, | ||
308 | 316 | ||
309 | makeComponent: { | 317 | makeComponent: { |
310 | value: function(name) { | 318 | value: function(name) { |