2 files changed, 24 insertions, 8 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 476db181..e6cc3763 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -80,7 +80,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <body>
 <div data-montage-id="viewOptions" class="viewOptions">
    <div>
-        <input class="zoomFont" data-montage-id="zoomFont"/>
+        <input class="zoomFont" data-montage-id="zoomFont" style="display:none;"/>
        <div class="autoCodeComplete" >
            <input type="checkbox" data-montage-id="codeComplete" />
            <label data-montage-id="autoCompleteLabel">Auto Code Hints</label>
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 5ad36db5..70d033fb 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
@@ -57,16 +57,25 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
                if(this._currentDocument.model.views.design){//code view of design document
                    this.application.ninja.editorViewOptions.visible = false;
-                    this.application.ninja.documentBar.codeEditorControls.visible = true;
+                    //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.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";
+            }
        }
    },
@@ -208,11 +217,6 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
            } else {
                this.autoCompleteLabel.classList.remove("disabled");
            }
-            //hide the zoom hottext if it is code view of a design file
-            if (this._currentDocument && this._currentDocument.model && this._currentDocument.model.views.design){
-                this.zoomHottext.element.style.display = "none";
-            }
        }
    },
@@ -222,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);