IKNINJA-1529 : zooming to fix font overlap issue

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

2 files changed, 8 insertions, 19 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 237be46c..41fd991e 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
@@ -24,7 +24,7 @@ var CodeEditorViewOptions = exports.CodeEditorViewOptions = Montage.create(Compo
 
                 Object.defineBinding(this.zoomHottext , "value", {
                   boundObject: this.application.ninja.codeEditorController,
-                  boundObjectPropertyPath: "editorFont",
+                  boundObjectPropertyPath: "zoomFactor",
                   oneway : false
                 });
 
diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index 08320db7..683cbd94 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -45,24 +45,15 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
         set: function(value){this._editorTheme = value;}
     },
 
-    originalEditorFont:{
-        value:"13"//px
-    },
-
-    _editorFont:{
+    _zoomFactor:{
         value:null
     },
 
-    editorFont:{
-        get: function(){return this._editorFont;},
-        set: function(value){//gets a zoom %
-            var codeLineElems = null, i=0;
-            this._editorFont = (value/100) * CodeEditorController.originalEditorFont;
-            //set the font size
-            codeLineElems = document.getElementsByClassName("CodeMirror-lines");
-            for(i=0;i<codeLineElems.length;i++){
-                codeLineElems[i].style.fontSize = ""+this._editorFont+"px";
-            }
+    zoomFactor:{
+        get: function(){return this._zoomFactor;},
+        set: function(value){
+            this._zoomFactor = value;
+            this.application.ninja.documentController.activeDocument.container.style.zoom = ""+value+"%";
         }
     },
 
@@ -224,14 +215,12 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
 
     applySettings:{
         value:function(){
-            var codeLineElem = null, i=0;
             //set theme
             this.handleThemeSelection();
             //check autocomplete support
             this.handleCodeCompletionSupport(this.application.ninja.documentController.activeDocument.editor.getOption("mode"));
             //set zoom
-            codeLineElem = this.application.ninja.documentController.activeDocument.container.getElementsByClassName("CodeMirror-lines")[0];
-            codeLineElem.style.fontSize = ""+this._editorFont+"px";
+            this.application.ninja.documentController.activeDocument.container.style.zoom = ""+this.zoomFactor+"%";
         }
     }
 });
\ No newline at end of file