diff options
author | Eric Guzman | 2012-05-22 15:57:23 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-22 15:57:23 -0700 |
commit | ad3b4595d7377e5bf75bcb8ad81007859b0a8a02 (patch) | |
tree | ecb7fe289824a625b1dc422a97c2236826081ec3 /js/ninja.reel/ninja.js | |
parent | 0eb95ff2dbba1fe7213eed2e0140b4d07bda3dd5 (diff) | |
parent | 2b207ef8b2594927f8cd6cd63a8483d205cb86c4 (diff) | |
download | ninja-ad3b4595d7377e5bf75bcb8ad81007859b0a8a02.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/ninja.reel/ninja.js')
-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"); |