diff options
author | Eric Guzman | 2012-05-25 16:37:43 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-25 16:37:43 -0700 |
commit | e884d2769a53dd8920b485672631b50158ed0800 (patch) | |
tree | 526934085f973f0bcfef5a3f130794530396aa03 /js/ninja.reel | |
parent | 1f7c17d688c3340b31d2e1c2b7205b10bd806968 (diff) | |
parent | 81239571c538f72e398fafa5b07725bf1bbb2d5d (diff) | |
download | ninja-e884d2769a53dd8920b485672631b50158ed0800.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.js | 14 |
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 | ||