123

DevExpress · Apr 10, 2018 · b55ba99 · b55ba99
1 parent e54c0ba
commit b55ba99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/src/client/automation/playback/type/type-text.js b/src/client/automation/playback/type/type-text.js
@@ -82,21 +82,6 @@ function _excludeInvisibleSymbolsFromSelection (selection) {
     return selection;
 }
 
-var getSelectionInfo = (selection, text) => {
-    const startNode      = selection.startPos.node;
-    const startOffset    = selection.startPos.offset;
-    const endOffset      = selection.endPos.offset;
-    const nodeValue      = startNode.nodeValue;
-    const selectPosition = { node: startNode, offset: startOffset + text.length };
-
-    return {
-        startOffset,
-        endOffset,
-        nodeValue,
-        selectPosition
-    };
-};
-
 function _typeTextToContentEditable (element, text) {
     var currentSelection = _getSelectionInElement(element);
     var startNode        = currentSelection.startPos.node;
@@ -152,27 +137,24 @@ function _typeTextToContentEditable (element, text) {
         return;
     }
 
-    currentSelection =  _excludeInvisibleSymbolsFromSelection(currentSelection);
+    currentSelection = _excludeInvisibleSymbolsFromSelection(currentSelection);
     startNode        = currentSelection.startPos.node;
-    var prevStartNode  = startNode;
 
     beforeContentChanged();
 
     if (needRaiseInput) {
-
-        // NOTE: selection could be changed on textInput event
-
         const changedSelection = _excludeInvisibleSymbolsFromSelection(_getSelectionInElement(element));
+        const selectionChangedOnTextInput = !domUtils.isTheSameNode(currentSelection.startPos.node, changedSelection.startPos.node);
 
-        startNode = changedSelection.startPos.node;
-
-        const selectionChanged = !domUtils.isTheSameNode(prevStartNode, startNode);
-
-
-        if (selectionChanged)
+        if (selectionChangedOnTextInput) {
             currentSelection = changedSelection;
+            startNode        = currentSelection.startPos.node;
+        }
 
-        const { startOffset, endOffset, nodeValue, selectPosition } = getSelectionInfo(currentSelection, text);
+        const startOffset    = currentSelection.startPos.offset;
+        const endOffset      = currentSelection.endPos.offset;
+        const nodeValue      = startNode.nodeValue;
+        const selectPosition = { node: startNode, offset: startOffset + text.length };
 
         startNode.nodeValue = nodeValue.substring(0, startOffset) + text + nodeValue.substring(endOffset, nodeValue.length);
 

diff --git a/test/functional/fixtures/regression/gh-1956/pages/test.html b/test/functional/fixtures/regression/gh-1956/pages/test.html
@@ -2,7 +2,6 @@
 <head><title>Edit test</title></head>
 <script type="text/javascript">
     function onTextInput (event) {
-        debugger
         if (event.target.id === 'input1')
             onTextInput1(event);
         if (event.target.id === 'input2')
@@ -12,7 +11,6 @@
     }
 
     function onTextInput1 (event) {
-        debugger
         event.target.childNodes[0].childNodes[0].nodeValue += event.data;
         event.preventDefault();
     }
@@ -42,11 +40,8 @@
     function onInput (event) {
         if (event.target.id === 'input1')
             throw new Error('Input on `input1` should be prevented');
-
-        debugger
     }
 
-    document.addEventListener('textinput', onTextInput, true); // IE way
     document.addEventListener('textInput', onTextInput, true); // Chrome way
     document.addEventListener('input', onInput, true);
 

diff --git a/test/functional/fixtures/regression/gh-1956/testcafe-fixtures/index.js b/test/functional/fixtures/regression/gh-1956/testcafe-fixtures/index.js
@@ -1,7 +1,7 @@
 import { Selector } from 'testcafe';
 
 fixture('test')
-    .page`../pages/test.html`;
+    .page `http://localhost:3000/fixtures/regression/gh-1956/pages/test.html`;
 
 const input1 = Selector('#input1');
 const input3 = Selector('#input3');