aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/element-controller.js
diff options
context:
space:
mode:
authorJonathan Duran2012-02-27 11:22:51 -0800
committerJonathan Duran2012-02-27 11:22:51 -0800
commitab10898c78f2bd5d765d9c915848ed8c8e08c5a3 (patch)
treeb1ebb87e9c101c558108e1cec043d64a03cc50a1 /js/controllers/elements/element-controller.js
parentfb8aacbadba8dffb9619eb16e4626c197dc9264d (diff)
parentda60be29baab67440535b6b2b71fe7de989dfed0 (diff)
downloadninja-ab10898c78f2bd5d765d9c915848ed8c8e08c5a3.tar.gz
Merge branch 'refs/heads/integration-candidate' into Timeline
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-xjs/controllers/elements/element-controller.js6
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