diff options
author | Jose Antonio Marquez | 2012-05-18 09:52:15 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-18 09:52:15 -0700 |
commit | 6c70c8bf28c2239d29f3abecc8a7ea59b2860bab (patch) | |
tree | c506b28bc82f74072f324d920105737726d5ecaf /js/components/layout/document-entry.reel/document-entry.js | |
parent | 015df99dff8306f8839affd22cdd7689eb00e180 (diff) | |
parent | 24d1873302b2fffc25d254e15e8aa36f59eedb88 (diff) | |
download | ninja-6c70c8bf28c2239d29f3abecc8a7ea59b2860bab.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/components/layout/document-entry.reel/document-entry.js')
-rwxr-xr-x | js/components/layout/document-entry.reel/document-entry.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js index ad0236c6..50b3624c 100755 --- a/js/components/layout/document-entry.reel/document-entry.js +++ b/js/components/layout/document-entry.reel/document-entry.js | |||
@@ -121,8 +121,8 @@ exports.DocumentEntry = Montage.create(Component, { | |||
121 | if(event._event.target.nodeName === "IMG") { | 121 | if(event._event.target.nodeName === "IMG") { |
122 | this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); | 122 | this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); |
123 | } else { | 123 | } else { |
124 | if(!this._document.isActive) { | 124 | if(!this.active) { |
125 | this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid)); | 125 | this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid)); |
126 | } | 126 | } |
127 | } | 127 | } |
128 | } | 128 | } |