1 files changed, 32 insertions, 3 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index 9344d34c..2ca6118b 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -51,14 +51,31 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            if(!value || this._currentDocument.currentView === "design") {
+            if(!value || (this._currentDocument.currentView === "design")) {
                 this.visible = false;
-            } else {
-                this.visible = true;
+            } else if(this._currentDocument && this._currentDocument.currentView === "code") {
+
+                if(this._currentDocument.model.views.design){//code view of design document
+                    this.application.ninja.editorViewOptions.visible = false;
+                    //this.application.ninja.documentBar.codeEditorControls.visible = false;//todo
+                }else if(!this._currentDocument.model.views.design){//code view for text document
+                    this.application.ninja.editorViewOptions.visible = true;
+                    //this.application.ninja.documentBar.codeEditorControls.visible = false;
+                }
+
                 this.autocomplete = !this.codeCompletionSupport[this._currentDocument.model.file.extension];
                 this._currentDocument.model.views.code.editor.automaticCodeHint = this.codeCompleteCheck.checked;
             }
 
+            if(this._currentDocument && (this._currentDocument.currentView === "design")) {
+                this._currentDocument.addPropertyChangeListener("model.currentViewIdentifier", this, false);
+            }
+
+            //hide the zoom hottext if it is code view of a design file
+            if (this._currentDocument && this._currentDocument.model && this._currentDocument.model.views.code){
+                this.zoomHottext.element.style.display = "block";
+            }
+
         }
     },
 
@@ -209,6 +226,18 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
         }
     },
 
+    handleChange: {
+        value: function(notification) {
+            if(notification.currentPropertyPath === "model.currentViewIdentifier") {
+                if(this.currentDocument.model.currentView.identifier === "design-code") {
+                    //this.application.ninja.documentBar.codeEditorControls.visible = false;//todo
+                } else {
+                    //this.application.ninja.documentBar.codeEditorControls.visible = false;
+                }
+            }
+        }
+    },
+
     handleFormat:{
         value: function(evt){
             var range = this.getSelectedRange(this.currentDocument.model.views.code.editor);