diff options
| author | John Mayhew | 2012-04-04 14:41:16 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-04-04 14:41:16 -0700 |
| commit | 7249d6377c8897b2f9d8115be99717be971a0981 (patch) | |
| tree | 9415f5ba25ad643df678e561719d2708fd3ead5a /js/panels/Components | |
| parent | ebdfa77a5399d245ddf134ee8110b2d046922a71 (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-7249d6377c8897b2f9d8115be99717be971a0981.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/lib/drawing/world.js
Diffstat (limited to 'js/panels/Components')
| -rwxr-xr-x | js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js index 3505393c..e990551b 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js | |||
| @@ -302,7 +302,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
| 302 | 302 | ||
| 303 | that.application.ninja.currentDocument.setComponentInstance(instance, element); | 303 | that.application.ninja.currentDocument.setComponentInstance(instance, element); |
| 304 | 304 | ||
| 305 | NJevent("elementAdding", {"el": element, "data":styles}); | 305 | that.application.ninja.elementMediator.addElements(element, styles); |
| 306 | }); | 306 | }); |
| 307 | 307 | ||
| 308 | } | 308 | } |