aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-02 09:23:13 -0700
committerNivesh Rajbhandari2012-07-02 09:23:13 -0700
commit2bae1b3148233288ec0bc50876935bdfea1f288c (patch)
tree686fa3b5b9615941bb7013f35c91e8f326b049db /js/ninja.reel
parent2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html2
-rwxr-xr-xjs/ninja.reel/ninja.js16
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);