Fixed issue xdan/jodit#18

vinhtranchau · Feb 10, 2018 · a8be766 · a8be766
1 parent c427e8f
commit a8be766
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 26 deletions.
diff --git a/src/modules/EventsNative.ts b/src/modules/EventsNative.ts
@@ -93,7 +93,7 @@ export class EventsNative {
      * });
      * ```
      */
-    current: string = '';
+    current: string[] = [];
 
     private doc: Document = document;
     constructor(doc?: Document){
@@ -474,15 +474,18 @@ export class EventsNative {
                 } else {
                     const blocks: EventHandlerBlock[] | void = store.get(event, namespace);
                     if (blocks) {
-                        this.current = event;
+
 
                         try {
                             blocks.every((block: EventHandlerBlock): boolean => {
                                 if (this.isStopped(blocks)) {
                                     return false;
                                 }
 
+                                this.current.push(event);
                                 result_value = block.syntheticCallback.apply(subject, argumentsList);
+                                this.current.pop();
+
                                 if (result_value !== undefined) {
                                     result = result_value;
                                 }

diff --git a/src/plugins/fullsize.ts b/src/plugins/fullsize.ts
@@ -80,6 +80,8 @@ export  function fullsize(editor: Jodit) {
                 condition = !editor.container.classList.contains('jodit_fullsize');
             }
 
+            editor.options.fullsize = !!condition;
+
             shown = condition;
 
             editor.container.classList.toggle('jodit_fullsize', condition);

diff --git a/src/plugins/search.ts b/src/plugins/search.ts
@@ -446,7 +446,7 @@ export class search extends Component {
                     }
                 })
                 .on('searchNext searchPrevious', () => {
-                    return self.findAndSelect(editor.selection.current() || editor.editor.firstChild, self.queryInput.value, editor.events.current === 'searchNext');
+                    return self.findAndSelect(editor.selection.current() || editor.editor.firstChild, self.queryInput.value, editor.events.current[editor.events.current.length - 1] === 'searchNext');
                 })
                 .on('search', (value: string, next: boolean = true) => {
                     editor.execCommand('search', value, next);

diff --git a/src/plugins/size.ts b/src/plugins/size.ts
@@ -5,7 +5,7 @@
  */
 
 import {Jodit} from "../Jodit";
-import {css, dom, throttle} from "../modules/Helpers";
+import {css, debounce, dom, throttle} from "../modules/Helpers";
 import {Config} from '../Config'
 
 declare module "../Config" {
@@ -55,11 +55,13 @@ export function size(editor: Jodit) {
             });
     }
 
-    const resizeWorkspace = () => {
-        css(editor.workplace, {
-            height: editor.container.offsetHeight - editor.toolbar.container.offsetHeight
-        });
-    };
+    const resizeWorkspace = debounce(() => {
+        if (editor.options.height !== 'auto' || editor.options.fullsize) {
+            css(editor.workplace, {
+                height: editor.container.offsetHeight - editor.toolbar.container.offsetHeight
+            });
+        }
+    }, editor.options.observer.timeout);
 
     editor.events
         .on('afterInit', () => {
@@ -94,11 +96,8 @@ export function size(editor: Jodit) {
                     width: editor.options.width,
                 });
             }
-        }, undefined, undefined,true);
+        }, undefined, undefined,true)
+        .on(window, 'load', resizeWorkspace)
+        .on('afterInit resize updateToolbar scroll afterResize', resizeWorkspace)
 
-    if (editor.options.height !== 'auto') {
-        editor.events
-            .on(window, 'load', resizeWorkspace)
-            .on('afterInit resize updateToolbar scroll', resizeWorkspace)
-    }
 }
diff --git a/test/tests/editorTest.js b/test/tests/editorTest.js
@@ -146,20 +146,45 @@ describe('Jodit Editor Tests', function() {
                     simulateEvent('resize', 0, window);
                     expect(editor.container.offsetHeight).to.be.equal(300);
                 });
-                it('Should restore size after fullsized mode', function () {
-                    var area = appendTestArea();
-                    var editor = new Jodit(area, {
-                        height: 300
+
+
+
+                describe('Fullsize mode', function () {
+                    it('Should set heights of workplace to 100% - toolbar\'s height', function () {
+                        var area = appendTestArea();
+                        var editor = new Jodit(area, {
+                            fullsize: true
+                        });
+
+                        expect(editor.workplace.offsetHeight).to.be.above(300);
+
                     });
-                    editor.setEditorValue('<p>test</p>'.repeat(20))
-                    expect(editor.container.offsetHeight).to.be.equal(300);
+                    it('Should restore size after fullsized mode', function () {
+                        var area = appendTestArea();
+                        var editor = new Jodit(area, {
+                            height: 300
+                        });
+                        editor.setEditorValue('<p>test</p>'.repeat(20))
+                        expect(editor.container.offsetHeight).to.be.equal(300);
 
-                    editor.events.fire('toggleFullsize', true);
-                    expect(editor.container.offsetHeight).to.be.above(300);
+                        editor.events.fire('toggleFullsize', true);
+                        expect(editor.container.offsetHeight).to.be.above(300);
 
-                    editor.events.fire('toggleFullsize', false);
-                    expect(editor.container.offsetHeight).to.be.equal(300);
-                    expect(editor.container.offsetWidth).to.be.above(300);
+                        editor.events.fire('toggleFullsize', false);
+                        expect(editor.container.offsetHeight).to.be.equal(300);
+                        expect(editor.container.offsetWidth).to.be.above(300);
+                    });
+
+                    it('Should hide resizer', function () {
+                        var area = appendTestArea();
+                        var editor = new Jodit(area, {
+                            height: 300,
+                            iframe: true
+                        });
+                        expect(editor.container.querySelectorAll('.jodit_editor_resize').length).to.be.equal(1);
+                        editor.events.fire('toggleFullsize', true);
+
+                    });
                 });
                 it('Should add resize handle', function () {
                     var area = appendTestArea();