aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-24 11:59:17 -0700
committerValerio Virgillito2012-05-24 11:59:17 -0700
commit70ff8dd670bc37c14caf850e06791d1e293b1e4b (patch)
tree8e00a27c6c908dda3e816d1f5aaf0d2a889ca5dc /js/ninja.reel
parenta8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (diff)
parenta6db492176a85546047dae6d5ecb9cfc4325e043 (diff)
downloadninja-70ff8dd670bc37c14caf850e06791d1e293b1e4b.tar.gz
Merge pull request #255 from joseeight/Document
Cleaning up referencing to documentRoot
Diffstat (limited to 'js/ninja.reel')
-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 9f1d1b3b..d0eb1557 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -279,8 +279,8 @@ exports.Ninja = Montage.create(Component, {
279 value: function(event) { 279 value: function(event) {
280 this.currentDocument = event.detail; 280 this.currentDocument = event.detail;
281 281
282 if(this.currentDocument.documentRoot) { 282 if(this.currentDocument.model.documentRoot) {
283 this.currentSelectedContainer = this.currentDocument.documentRoot; 283 this.currentSelectedContainer = this.currentDocument.model.documentRoot;
284 } else { 284 } else {
285 alert("The current document has not loaded yet"); 285 alert("The current document has not loaded yet");
286 return; 286 return;
@@ -295,8 +295,8 @@ exports.Ninja = Montage.create(Component, {
295 value: function() { 295 value: function() {
296 this.currentDocument = this.documentController.activeDocument; 296 this.currentDocument = this.documentController.activeDocument;
297 297
298 if(this.currentDocument.documentRoot) { 298 if(this.currentDocument.model.documentRoot) {
299 this._currentSelectedContainer = this.selectionController._selectionContainer = this.currentDocument.documentRoot; 299 this._currentSelectedContainer = this.selectionController._selectionContainer = this.currentDocument.model.documentRoot;
300 } 300 }
301 301
302 NJevent("switchDocument"); 302 NJevent("switchDocument");
@@ -320,9 +320,9 @@ exports.Ninja = Montage.create(Component, {
320 } 320 }
321 321
322 // TODO: Remove marker for old template: NINJA-STAGE-REWORK 322 // TODO: Remove marker for old template: NINJA-STAGE-REWORK
323// this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); 323// this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "body-background", background);
324// this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); 324// this.currentDocument.model.documentRoot.elementModel.controller.setProperty(this.currentDocument.model.documentRoot, "overflow", overflow);
325// this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); 325// this.currentDocument.model.documentRoot.elementModel.controller.changeSelector(this.currentDocument.model.documentRoot, "transitionStopRule", transitionStopRule);
326 326
327 this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule; 327 this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule;
328 328