diff options
author | Jose Antonio Marquez Russo | 2012-02-24 15:44:57 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-02-24 15:44:57 -0800 |
commit | 97c0efb645b1e0488112c1b7bfd7fa4864eae3dc (patch) | |
tree | ae6c6587af2ab5ec34f86ac05d342ecf8ebfc0c7 /js/controllers/elements | |
parent | c916a2a5fec0c96bd1c6f56af82543da9b69c33c (diff) | |
parent | b056b4bef5982466d80d72e5cbb31e63087990e1 (diff) | |
download | ninja-97c0efb645b1e0488112c1b7bfd7fa4864eae3dc.tar.gz |
Merge pull request #19 from ananyasen/FileIO
FileIO branch pull request
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 46e82ace..ec0335b4 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -27,7 +27,11 @@ var ElementController = exports.ElementController = Montage.create(NJComponent, | |||
27 | 27 | ||
28 | getProperty: { | 28 | getProperty: { |
29 | value: function(el, prop, fallbackOnComputed, isStageElement) { | 29 | value: function(el, prop, fallbackOnComputed, isStageElement) { |
30 | return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement); | 30 | if(el.nodeType !== 3){ |
31 | return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement); | ||
32 | }else{ | ||
33 | return null; | ||
34 | } | ||
31 | } | 35 | } |
32 | }, | 36 | }, |
33 | 37 | ||