diff options
author | Jose Antonio Marquez | 2012-05-10 15:37:07 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-10 15:37:07 -0700 |
commit | de7a9dd3cfe090362957d4fa7250e290c7aba20c (patch) | |
tree | c6b05f10925c9612925bc77712e2cd0eda9e179d /js/ninja.reel | |
parent | d75aff9e251f84a13c326668a5271b5852dcde53 (diff) | |
parent | 9ace5e2348ead2cd40542531c54b4a243974d266 (diff) | |
download | ninja-de7a9dd3cfe090362957d4fa7250e290c7aba20c.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.js | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 4d7d883d..f518378a 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -284,19 +284,23 @@ exports.Ninja = Montage.create(Component, { | |||
284 | var background, overflow, transitionStopRule; | 284 | var background, overflow, transitionStopRule; |
285 | this.stage.hideCanvas(this.appModel.livePreview); | 285 | this.stage.hideCanvas(this.appModel.livePreview); |
286 | 286 | ||
287 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK | ||
287 | if(this.appModel.livePreview) { | 288 | if(this.appModel.livePreview) { |
288 | background = "#000000"; | 289 | // background = "#000000"; |
289 | overflow = "hidden"; | 290 | // overflow = "hidden"; |
290 | transitionStopRule = "nj-css-garbage-selector"; | 291 | transitionStopRule = "nj-css-garbage-selector"; |
291 | } else { | 292 | } else { |
292 | background = "#808080"; | 293 | // background = "#808080"; |
293 | overflow = "visible"; | 294 | // overflow = "visible"; |
294 | transitionStopRule = "*" | 295 | transitionStopRule = "*" |
295 | } | 296 | } |
296 | 297 | ||
297 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); | 298 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK |
298 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); | 299 | // this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); |
299 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); | 300 | // this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); |
301 | // this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); | ||
302 | |||
303 | this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; | ||
300 | 304 | ||
301 | this._toggleWebGlAnimation(this.appModel.livePreview); | 305 | this._toggleWebGlAnimation(this.appModel.livePreview); |
302 | } | 306 | } |