diff options
author | Valerio Virgillito | 2012-02-21 14:36:41 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-21 14:36:41 -0800 |
commit | 1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d (patch) | |
tree | febe5a23c3667523e90de031987a11764f417da7 /js/controllers/elements | |
parent | b1daf0b285a4a96bfd0086709c20e3682d75551a (diff) | |
parent | f9d34a54baf61ccdf77732b1aaedb29d296b8c2e (diff) | |
download | ninja-1d2c928c35ccc7cd875a329b2e235f34eb4f0c0d.tar.gz |
Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal into file-io
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 65d26bdd..ac14def4 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -12,6 +12,9 @@ var ElementController = exports.ElementController = Montage.create(NJComponent, | |||
12 | addElement: { | 12 | addElement: { |
13 | value: function(el, styles) { | 13 | value: function(el, styles) { |
14 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | 14 | this.application.ninja.currentDocument.documentRoot.appendChild(el); |
15 | // Nested elements - | ||
16 | // TODO make sure the CSS is correct before nesting elements | ||
17 | // this.application.ninja.currentSelectedContainer.appendChild(el); | ||
15 | this.application.ninja.stylesController.setElementStyles(el, styles); | 18 | this.application.ninja.stylesController.setElementStyles(el, styles); |
16 | } | 19 | } |
17 | }, | 20 | }, |