aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-07-02 13:19:20 -0700
committerArmen Kesablyan2012-07-02 13:19:20 -0700
commit526b9d76686323f488f1b26175440172b715d808 (patch)
tree47fc6bd90715b403a08d08a48a86f4d24da1ba29 /js/ninja.reel/ninja.js
parentb194664df7e01aaeb8d1e7220a6de0e7f879f1db (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-526b9d76686323f488f1b26175440172b715d808.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js14
1 files changed, 2 insertions, 12 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 9942300c..94f69ed8 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -511,27 +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";
522 this.stage.bindingView.hide = true; 519 this.stage.bindingView.hide = true;
523 } else { 520 } else {
524// background = "#808080";
525// overflow = "visible";
526 transitionStopRule = "*" 521 transitionStopRule = "*"
527 this.stage.bindingView.hide = false; 522 this.stage.bindingView.hide = false;
528 } 523 }
529 524
530 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
531// this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "body-background", background);
532// this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "overflow", overflow);
533// this.currentDocument.model.documentRoot.elementModel.controller.changeSelector(this.currentDocument.model.documentRoot, "transitionStopRule", transitionStopRule);
534
535 this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; 525 this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule;
536 526
537 this._toggleWebGlAnimation(this.appModel.livePreview); 527 this._toggleWebGlAnimation(this.appModel.livePreview);