Merge pull request #7443 from lkcampbell/fix-font-size-event

Fix fontSizeChange event for Restore Font Size command
adobe · Apr 8, 2014 · b254d6c · b254d6c
2 parents 9111c08 + 1547c8b
commit b254d6c
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/view/ViewCommandHandlers.js b/src/view/ViewCommandHandlers.js
@@ -102,17 +102,29 @@ define(function (require, exports, module) {
      * @param {string=} fontSizeStyle  A string with the font size and the size unit
      */
     function _setSizeAndRestoreScroll(fontSizeStyle) {
-        var editor    = EditorManager.getCurrentFullEditor(),
-            oldWidth  = editor._codeMirror.defaultCharWidth(),
-            scrollPos = editor.getScrollPos(),
-            line      = editor._codeMirror.lineAtHeight(scrollPos.y, "local");
+        var editor      = EditorManager.getCurrentFullEditor(),
+            oldWidth    = editor._codeMirror.defaultCharWidth(),
+            oldFontSize = $(".CodeMirror").css("font-size"),
+            newFontSize = "",
+            delta       = 0,
+            adjustment  = 0,
+            scrollPos   = editor.getScrollPos(),
+            line        = editor._codeMirror.lineAtHeight(scrollPos.y, "local");
 
         _removeDynamicFontSize();
         if (fontSizeStyle) {
             _addDynamicFontSize(fontSizeStyle);
         }
         editor.refreshAll();
 
+        delta = /em$/.test(oldFontSize) ? 10 : 1;
+        newFontSize = $(".CodeMirror").css("font-size");
+        adjustment = parseInt((parseFloat(newFontSize) - parseFloat(oldFontSize)) * delta, 10);
+
+        if (adjustment) {
+            $(exports).triggerHandler("fontSizeChange", [adjustment, newFontSize]);
+        }
+
         // Calculate the new scroll based on the old font sizes and scroll position
         var newWidth   = editor._codeMirror.defaultCharWidth(),
             deltaX     = scrollPos.x / oldWidth,
@@ -153,7 +165,6 @@ define(function (require, exports, module) {
         _setSizeAndRestoreScroll(fsStr);
         PreferencesManager.setViewState("fontSizeStyle", fsStr);
 
-        $(exports).triggerHandler("fontSizeChange", [adjustment, fsStr]);
         return true;
     }