aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-25 11:22:58 -0700
committerArmen Kesablyan2012-05-25 11:22:58 -0700
commit81239571c538f72e398fafa5b07725bf1bbb2d5d (patch)
treed31c876f5af61565eff8c934c9e5f119696d46e0 /js/ninja.reel/ninja.js
parente8c4e98c24092a360eb2f637983fd104fbb67f66 (diff)
parent9c8d724dd1605ee2e5257591e0bfaad575cbc906 (diff)
downloadninja-81239571c538f72e398fafa5b07725bf1bbb2d5d.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index de34c7b0..9f5a65bd 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -299,8 +299,8 @@ exports.Ninja = Montage.create(Component, {
299 value: function(event) { 299 value: function(event) {
300 this.currentDocument = event.detail; 300 this.currentDocument = event.detail;
301 301
302 if(this.currentDocument.documentRoot) { 302 if(this.currentDocument.model.documentRoot) {
303 this.currentSelectedContainer = this.currentDocument.documentRoot; 303 this.currentSelectedContainer = this.currentDocument.model.documentRoot;
304 } else { 304 } else {
305 alert("The current document has not loaded yet"); 305 alert("The current document has not loaded yet");
306 return; 306 return;
@@ -315,8 +315,8 @@ exports.Ninja = Montage.create(Component, {
315 value: function() { 315 value: function() {
316 this.currentDocument = this.documentController.activeDocument; 316 this.currentDocument = this.documentController.activeDocument;
317 317
318 if(this.currentDocument.documentRoot) { 318 if(this.currentDocument.model.documentRoot) {
319 this._currentSelectedContainer = this.selectionController._selectionContainer = this.currentDocument.documentRoot; 319 this._currentSelectedContainer = this.selectionController._selectionContainer = this.currentDocument.model.documentRoot;
320 } 320 }
321 321
322 NJevent("switchDocument"); 322 NJevent("switchDocument");
@@ -340,9 +340,9 @@ exports.Ninja = Montage.create(Component, {
340 } 340 }
341 341
342 // TODO: Remove marker for old template: NINJA-STAGE-REWORK 342 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
343// this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); 343// this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "body-background", background);
344// this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); 344// this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "overflow", overflow);
345// this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); 345// this.currentDocument.model.documentRoot.elementModel.controller.changeSelector(this.currentDocument.model.documentRoot, "transitionStopRule", transitionStopRule);
346 346
347 this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; 347 this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule;
348 348