diff options
| author | Jose Antonio Marquez | 2012-05-24 11:38:51 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-05-24 11:38:51 -0700 |
| commit | e64328dc08418730ca580d33381cb2001c7a96fd (patch) | |
| tree | 74e3996696adfea94158c29575e9393e56169930 /js/components | |
| parent | d57cd68741f340a45be780675ed79b5caf2094e9 (diff) | |
| parent | a8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (diff) | |
| download | ninja-e64328dc08418730ca580d33381cb2001c7a96fd.tar.gz | |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Conflicts:
js/document/document-html.js
js/helper-classes/3D/view-utils.js
js/stage/stage.reel/stage.js
Diffstat (limited to 'js/components')
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index 2db775eb..49dbe3cb 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js | |||
| @@ -21,7 +21,7 @@ exports.Breadcrumb = Montage.create(Component, { | |||
| 21 | 21 | ||
| 22 | handleCloseDocument: { | 22 | handleCloseDocument: { |
| 23 | value: function(){ | 23 | value: function(){ |
| 24 | if(!this.application.ninja.documentController.activeDocument) { | 24 | if(!this.application.ninja.documentController.activeDocument && this.application.ninja.currentDocument.currentView !== "code") { |
| 25 | this.disabled = true; | 25 | this.disabled = true; |
| 26 | this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.model.documentRoot : null); | 26 | this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.model.documentRoot : null); |
| 27 | } | 27 | } |