diff options
| author | Eric Guzman | 2012-08-20 14:54:44 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-08-20 14:54:44 -0700 |
| commit | 1e9d019867ff90840735ec531af5ebec9c7962e6 (patch) | |
| tree | 887d28987a3113e84c771e264767c9462e9a8844 /js/controllers/styles-controller.js | |
| parent | a34663e154af834176b758b6da368f634cd2a6bd (diff) | |
| parent | 36d692a9fb216f2785a570d13c1beb27360c7305 (diff) | |
| download | ninja-1e9d019867ff90840735ec531af5ebec9c7962e6.tar.gz | |
Merge branch 'refs/heads/master' into minorFixes_7.1
Diffstat (limited to 'js/controllers/styles-controller.js')
| -rwxr-xr-x | js/controllers/styles-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index e95c6614..68d031fb 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
| @@ -87,7 +87,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
| 87 | set : function(document) { | 87 | set : function(document) { |
| 88 | ///// If the document is null set default stylesheets to null | 88 | ///// If the document is null set default stylesheets to null |
| 89 | 89 | ||
| 90 | if(!document || document.currentView === "code") { | 90 | if(!document || (document.currentView === "code" && document.model.currentView.identifier !== "design-code")) { |
| 91 | this._currentDocument = null; | 91 | this._currentDocument = null; |
| 92 | this._stageStylesheet = null; | 92 | this._stageStylesheet = null; |
| 93 | this.defaultStylesheet = null; | 93 | this.defaultStylesheet = null; |