diff options
author | Kruti Shah | 2012-07-03 10:08:44 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-03 10:08:44 -0700 |
commit | bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe (patch) | |
tree | 006f6243962aa2e2b59f688cf37b16162376dc39 /js/ninja.reel | |
parent | 3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.html | 2 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 5429e7d0..1ebf8413 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -163,7 +163,7 @@ | |||
163 | "element": {"#": "stageMode"} | 163 | "element": {"#": "stageMode"} |
164 | }, | 164 | }, |
165 | "bindings" : { | 165 | "bindings" : { |
166 | "livePreview": {"<->": "@appModel.livePreview"} | 166 | "chromePreview": {"<->": "@appModel.chromePreview"} |
167 | } | 167 | } |
168 | }, | 168 | }, |
169 | 169 | ||
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 859268a0..94f69ed8 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -511,25 +511,17 @@ exports.Ninja = Montage.create(Component, { | |||
511 | 511 | ||
512 | executeLivePreview: { | 512 | executeLivePreview: { |
513 | value: function() { | 513 | value: function() { |
514 | var background, overflow, transitionStopRule; | 514 | var transitionStopRule; |
515 | this.stage.hideCanvas(this.appModel.livePreview); | 515 | // this.stage.hideCanvas(this.appModel.livePreview); |
516 | 516 | ||
517 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK | ||
518 | if(this.appModel.livePreview) { | 517 | if(this.appModel.livePreview) { |
519 | // background = "#000000"; | ||
520 | // overflow = "hidden"; | ||
521 | transitionStopRule = "nj-css-garbage-selector"; | 518 | transitionStopRule = "nj-css-garbage-selector"; |
519 | this.stage.bindingView.hide = true; | ||
522 | } else { | 520 | } else { |
523 | // background = "#808080"; | ||
524 | // overflow = "visible"; | ||
525 | transitionStopRule = "*" | 521 | transitionStopRule = "*" |
522 | this.stage.bindingView.hide = false; | ||
526 | } | 523 | } |
527 | 524 | ||
528 | // TODO: Remove marker for old template: NINJA-STAGE-REWORK | ||
529 | // this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "body-background", background); | ||
530 | // this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "overflow", overflow); | ||
531 | // this.currentDocument.model.documentRoot.elementModel.controller.changeSelector(this.currentDocument.model.documentRoot, "transitionStopRule", transitionStopRule); | ||
532 | |||
533 | this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; | 525 | this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; |
534 | 526 | ||
535 | this._toggleWebGlAnimation(this.appModel.livePreview); | 527 | this._toggleWebGlAnimation(this.appModel.livePreview); |