fix: ut failures

Author: abose

src/document/DocumentCommandHandlers.js

@@ -1243,6 +1243,7 @@ define(function (require, exports, module) {
      *   USER_CANCELED object).
      */
     function handleFileSave(commandData) {
+        // todo save interceptor
         var activeEditor = EditorManager.getActiveEditor(),
             activeDoc = activeEditor && activeEditor.document,
             doc = (commandData && commandData.doc) || activeDoc,

src/editor/EditorCommandHandlers.js

@@ -36,7 +36,8 @@ define(function (require, exports, module) {
         StringUtils = require("utils/StringUtils"),
         TokenUtils = require("utils/TokenUtils"),
         CodeMirror = require("thirdparty/CodeMirror/lib/codemirror"),
-        _ = require("thirdparty/lodash");
+        _ = require("thirdparty/lodash"),
+        ChangeHelper = require("editor/EditorHelper/ChangeHelper");
 
     /**
      * List of constants
@@ -1190,44 +1191,20 @@ define(function (require, exports, module) {
         return result.promise();
     }
 
-    let _undoInterceptor = null;
-    let _redoInterceptor = null;
-
-    /**
-     * Use require("editor/EditorHelper/ChangeHelper") to intercept. this for internal use only
-     * @private
-     * @param {Function} interceptor - Function(editor, cm, event) that returns true to preventDefault
-     */
-    function _setUndoInterceptor(interceptor) {
-        _undoInterceptor = interceptor;
-    }
-
-    /**
-     * Use require("editor/EditorHelper/ChangeHelper") to intercept. this for internal use only
-     * @param {Function} interceptor - Function(editor, cm, event) that returns true to preventDefault
-     */
-    function _setRedoInterceptor(interceptor) {
-        _redoInterceptor = interceptor;
-    }
-
     function handleUndo() {
-        if(_undoInterceptor){
-            const focusedEditor = EditorManager.getFocusedEditor();
-            const codeMirror = focusedEditor && focusedEditor._codeMirror;
-            if(_undoInterceptor(focusedEditor, codeMirror, null)){
-                return;
-            }
+        const focusedEditor = EditorManager.getFocusedEditor();
+        const codeMirror = focusedEditor && focusedEditor._codeMirror;
+        if(ChangeHelper._onBeforeUndo(focusedEditor, codeMirror, null)){
+            return;
         }
         return handleUndoRedo("undo");
     }
 
     function handleRedo() {
-        if(_redoInterceptor){
-            const focusedEditor = EditorManager.getFocusedEditor();
-            const codeMirror = focusedEditor && focusedEditor._codeMirror;
-            if(_redoInterceptor(focusedEditor, codeMirror, null)){
-                return;
-            }
+        const focusedEditor = EditorManager.getFocusedEditor();
+        const codeMirror = focusedEditor && focusedEditor._codeMirror;
+        if(ChangeHelper._onBeforeRedo(focusedEditor, codeMirror, null)){
+            return;
         }
         return handleUndoRedo("redo");
     }
@@ -1307,7 +1284,4 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_COPY, Commands.EDIT_COPY, _execCommandCopy);
     CommandManager.register(Strings.CMD_PASTE, Commands.EDIT_PASTE, _execCommandPaste);
     CommandManager.register(Strings.CMD_SELECT_ALL, Commands.EDIT_SELECT_ALL, _handleSelectAll);
-
-    exports._setUndoInterceptor = _setUndoInterceptor;
-    exports._setRedoInterceptor = _setRedoInterceptor;
 });

src/editor/EditorHelper/ChangeHelper.js

@@ -31,8 +31,7 @@ define(function (require, exports, module) {
     let _keyEventInterceptor = null;
 
     const CodeMirror = require("thirdparty/CodeMirror/lib/codemirror"),
-        Menus = require("command/Menus"),
-        EditorCommandHandlers = require("editor/EditorCommandHandlers");
+        Menus = require("command/Menus");
 
     function _applyChanges(changeList) {
         // eslint-disable-next-line no-invalid-this
@@ -315,20 +314,37 @@ define(function (require, exports, module) {
         Editor.prototype._dontDismissPopupOnScroll = _dontDismissPopupOnScroll;
     }
 
+    let _undoInterceptor = null;
+    let _redoInterceptor = null;
+
+    function _onBeforeUndo(editor, codeMirror, event) {
+        if(!_undoInterceptor){
+            return false;
+        }
+        return _undoInterceptor(editor, codeMirror, event);
+    }
+
+    function _onBeforeRedo(editor, codeMirror, event) {
+        if(!_redoInterceptor){
+            return false;
+        }
+        return _redoInterceptor(editor, codeMirror, event);
+    }
+
     /**
      * Sets the undo interceptor function in before it goes to codemirror
      * @param {Function} interceptor - Function(editor, cm, event) that returns true to preventDefault
      */
     function setUndoInterceptor(interceptor) {
-        EditorCommandHandlers._setUndoInterceptor(interceptor);
+        _undoInterceptor = interceptor;
     }
 
     /**
      * Sets the redo interceptor function in before it goes to codemirror
      * @param {Function} interceptor - Function(editor, cm, event) that returns true to preventDefault
      */
     function setRedoInterceptor(interceptor) {
-        EditorCommandHandlers._setRedoInterceptor(interceptor);
+        _redoInterceptor = interceptor;
     }
 
     /**
@@ -363,7 +379,12 @@ define(function (require, exports, module) {
         _keyEventInterceptor = interceptor;
     }
 
-    exports.addHelpers =addHelpers;
+    // private exports
+    exports._onBeforeUndo =_onBeforeUndo;
+    exports._onBeforeRedo = _onBeforeRedo;
+
+    // public exports
+    exports.addHelpers = addHelpers;
     exports.setUndoInterceptor = setUndoInterceptor;
     exports.setRedoInterceptor = setRedoInterceptor;
     exports.setCutInterceptor = setCutInterceptor;