aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
diff options
context:
space:
mode:
authorEric Guzman2012-04-04 11:36:22 -0700
committerEric Guzman2012-04-04 11:36:22 -0700
commitaf52148777d554dc6e55a736574b82e4916f1fea (patch)
tree39705d138b489d2e90722238c850320fd6b6a8e9 /js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
parentb7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 (diff)
parenta11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff)
downloadninja-af52148777d554dc6e55a736574b82e4916f1fea.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Conflicts: js/controllers/presets-controller.js
Diffstat (limited to 'js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js')
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js2
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 }