diff options
author | Ananya Sen | 2012-05-22 17:59:03 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-22 17:59:03 -0700 |
commit | ae9f289ab9c6fd17ae88fd272dfaa7beabcd649b (patch) | |
tree | 9e27878524eb2781a7f3094de0d5ed3f84624980 /js/ninja.reel | |
parent | ee54342b5f4fdd41c46543d6402e649e4b3d57cb (diff) | |
parent | a341522e3603c18ab3b93defa894e3be702dd0f4 (diff) | |
download | ninja-ae9f289ab9c6fd17ae88fd272dfaa7beabcd649b.tar.gz |
Merge branch 'refs/heads/master-dom-architecture' into dom-architecture
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 80d1b406..9f1d1b3b 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -296,7 +296,7 @@ exports.Ninja = Montage.create(Component, { | |||
296 | this.currentDocument = this.documentController.activeDocument; | 296 | this.currentDocument = this.documentController.activeDocument; |
297 | 297 | ||
298 | if(this.currentDocument.documentRoot) { | 298 | if(this.currentDocument.documentRoot) { |
299 | this._currentSelectedContainer = this.selectionController._currentSelectedContainer = this.currentDocument.documentRoot; | 299 | this._currentSelectedContainer = this.selectionController._selectionContainer = this.currentDocument.documentRoot; |
300 | } | 300 | } |
301 | 301 | ||
302 | NJevent("switchDocument"); | 302 | NJevent("switchDocument"); |