New version 3.1.5. Read more https://github.com/xdan/jodit/releases/t…

…ag/3.1.5
xdan · Jan 10, 2018 · 5a1ed6f · 5a1ed6f
1 parent 91d6827
commit 5a1ed6f
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 19 deletions.
diff --git a/build/jodit.min.css b/build/jodit.min.css
diff --git a/build/jodit.min.js b/build/jodit.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jodit",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "Jodit is awesome and usefully wysiwyg editor with filebrowser",
   "main": "index.js",
   "scripts": {

diff --git a/src/plugins/search.ts b/src/plugins/search.ts
@@ -115,7 +115,7 @@ export class search extends Component {
             return;
         }
 
-        this.counterBox.style.display = this.queryInput.value.length ? 'inline-block' : 'none'
+        this.counterBox.style.display = this.queryInput.value.length ? 'inline-block' : 'none';
 
         const sel: Selection = this.jodit.editorWindow.getSelection(),
             range: Range = sel.rangeCount ? sel.getRangeAt(0) : this.jodit.editorDocument.createRange(),
@@ -178,18 +178,15 @@ export class search extends Component {
             let range: Range = this.jodit.editorDocument.createRange();
 
             try {
-
-                setTimeout(() => {
-                    if (bound && bound.startContainer && bound.endContainer) {
-                        range.setStart(bound.startContainer, <number>bound.startOffset);
-                        range.setEnd(bound.endContainer, <number>bound.endOffset);
-                        range.deleteContents();
-                        let textNode: Node = this.jodit.editorDocument.createTextNode(this.replaceInput.value);
-                        range.insertNode(textNode);
-                        this.jodit.selection.select(textNode)
-                        this.tryScrollToElement(textNode);
-                    }
-                }, this.jodit.options.observer.timeout);
+                if (bound && bound.startContainer && bound.endContainer) {
+                    range.setStart(bound.startContainer, <number>bound.startOffset);
+                    range.setEnd(bound.endContainer, <number>bound.endOffset);
+                    range.deleteContents();
+                    const textNode: Node = this.jodit.editorDocument.createTextNode(this.replaceInput.value);
+                    range.insertNode(textNode);
+                    this.jodit.selection.select(textNode);
+                    this.tryScrollToElement(textNode);
+                }
             } catch (e) {
 
             }

diff --git a/src/styles/plugins/search.less b/src/styles/plugins/search.less
@@ -109,7 +109,8 @@
         height: 50%;
         transition: background-color @timeout-button-active linear;
         &:focus {
-          background-color: fade(@color-background-selection, 9);
+          //background-color: fade(@color-background-selection, 9);
+          box-shadow: inset 0px 0px 3px 0px fade(@color-border, 58);
         }
       }
     }

diff --git a/test/tests/pluginsTest.js b/test/tests/pluginsTest.js
@@ -528,6 +528,58 @@ describe('Test plugins', function () {
                 expect(true).to.equal(editor.ownerDocument.activeElement === search.querySelector('.jodit_search-query'));
             });
         });
+        describe('CTRL + R', function () {
+            it('Should show search and replace form and query field must have focus', function () {
+                var editor = new Jodit('#editor_plugins_test', {
+                    observer: {
+                        timeout: 0
+                    }
+                });
+
+                var search = editor.container.querySelector('.jodit_search');
+                expect(false).to.equal(search.classList.contains('jodit_search-active'));
+                simulateEvent('keydown', Jodit.KEY_R, editor.editor, function (options) {
+                    options.ctrlKey = true
+                });
+                expect(true).to.equal(search.classList.contains('jodit_search-active'));
+                expect(true).to.equal(search.classList.contains('jodit_search-and-replace'));
+                expect(true).to.equal(editor.ownerDocument.activeElement === search.querySelector('.jodit_search-query'));
+            });
+            describe('Press Replace button', function () {
+                it('Should replace value form query field to value from replace field in editor', function () {
+                    var editor = new Jodit('#editor_plugins_test', {
+                        observer: {
+                            timeout: 0
+                        }
+                    });
+
+                    editor.setEditorValue('test test test')
+
+                    var search = editor.container.querySelector('.jodit_search');
+                    expect(false).to.equal(search.classList.contains('jodit_search-active'));
+                    simulateEvent('keydown', Jodit.KEY_R, editor.editor, function (options) {
+                        options.ctrlKey = true
+                    });
+                    expect(true).to.be.equal(search.classList.contains('jodit_search-active'));
+                    expect(true).to.be.equal(search.classList.contains('jodit_search-and-replace'));
+                    expect(true).to.be.equal(editor.ownerDocument.activeElement === search.querySelector('.jodit_search-query'));
+
+                    var query = search.querySelector('.jodit_search-query');
+                    var replace = search.querySelector('.jodit_search-replace');
+                    var replaceButton = search.querySelector('.jodit_search_buttons-replace');
+
+                    query.value = 't';
+                    replace.value = 'w';
+
+                    simulateEvent('click', 0, replaceButton);
+                    simulateEvent('click', 0, replaceButton);
+                    simulateEvent('click', 0, replaceButton);
+                    simulateEvent('click', 0, replaceButton);
+
+                    expect('wesw wesw test').to.be.equal(editor.getEditorValue());
+                });
+            });
+        });
         describe('F3 after search', function () {
             it('Should find a next match', function () {