aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-13 21:43:51 -0800
committerValerio Virgillito2012-02-13 21:43:51 -0800
commit081f17954c735fc8b946d72a25b0ee60d370ef9b (patch)
treede7b50f2d02365df897ef4356f953d3833c9cabd /js/io
parent47df0aff81c25334b129047bb227ea5015357eda (diff)
parent1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff)
downloadninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz
Merge branch 'refs/heads/master' into components
Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/io')
-rw-r--r--js/io/document/html-document.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index a8e06c69..393d29fe 100644
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -407,6 +407,9 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
407 407
408 this.documentRoot.elementModel.stageView = this.documentRoot.elementModel.defaultRule.cssRules[j]; 408 this.documentRoot.elementModel.stageView = this.documentRoot.elementModel.defaultRule.cssRules[j];
409 409
410 } else if(this.documentRoot.elementModel.defaultRule.cssRules[j].selectorText === "#stageBG") {
411
412 this.documentRoot.elementModel.stageBackground = this.documentRoot.elementModel.defaultRule.cssRules[j];
410 } 413 }
411 } 414 }
412 415