Convert EditorModule into class

src/editor/model/Editor.js

@@ -809,7 +809,7 @@ export default class EditorModel extends Model {
     view && view.remove();
     this.clear({ silent: true });
     this.destroyed = 1;
-    ['config', 'view', '_previousAttributes', '_events', '_listeners'].forEach(i => (this[i] = {}));
+    ['_config', 'view', '_previousAttributes', '_events', '_listeners'].forEach(i => (this[i] = {}));
     editors.splice(editors.indexOf(editor), 1);
     hasWin() && $(config.el).empty().attr(this.attrsOrig);
   }

test/specs/i18n/index.js

@@ -1,10 +1,10 @@
 import I18n from 'i18n';
-import Editor from 'editor/index';
+import Editor from 'editor';
 
 describe('I18n', () => {
   describe('Main', () => {
     let obj;
-    let editor = Editor().init();
+    let editor = new Editor().init();
     let em = editor.getModel();
 
     beforeEach(() => {
@@ -34,8 +34,8 @@ describe('I18n', () => {
         localeFallback,
         detectLocale: 0,
         messages: {
-          en: { msg }
-        }
+          en: { msg },
+        },
       });
       expect(obj.getLocale()).toBe(locale);
       expect(obj.getConfig().localeFallback).toBe(localeFallback);
@@ -44,7 +44,7 @@ describe('I18n', () => {
 
     test('English always imported', () => {
       obj.init({
-        messages: { it: {} }
+        messages: { it: {} },
       });
       expect(Object.keys(obj.getMessages())).toEqual(['en', 'it']);
     });
@@ -74,12 +74,12 @@ describe('I18n', () => {
       obj.setMessages(set1);
       const set2 = {
         en: { msg2: 'Msg 2 up', msg3: 'Msg 3' },
-        it: { msg1: 'Msg 1' }
+        it: { msg1: 'Msg 1' },
       };
       obj.addMessages(set2);
       expect(obj.getMessages()).toEqual({
         en: { msg1: 'Msg 1', msg2: 'Msg 2 up', msg3: 'Msg 3' },
-        it: { msg1: 'Msg 1' }
+        it: { msg1: 'Msg 1' },
       });
     });
 
@@ -90,19 +90,19 @@ describe('I18n', () => {
           msg2: 'Msg 2',
           msg3: {
             msg31: 'Msg 31',
-            msg32: { msg321: 'Msg 321' }
-          }
-        }
+            msg32: { msg321: 'Msg 321' },
+          },
+        },
       });
       obj.addMessages({
         en: {
           msg2: { msg21: 'Msg 21' },
           msg3: {
             msg32: { msg322: 'Msg 322' },
-            msg33: 'Msg 33'
+            msg33: 'Msg 33',
           },
-          msg4: 'Msg 4'
-        }
+          msg4: 'Msg 4',
+        },
       });
       expect(obj.getMessages()).toEqual({
         en: {
@@ -112,12 +112,12 @@ describe('I18n', () => {
             msg31: 'Msg 31',
             msg32: {
               msg321: 'Msg 321',
-              msg322: 'Msg 322'
+              msg322: 'Msg 322',
             },
-            msg33: 'Msg 33'
+            msg33: 'Msg 33',
           },
-          msg4: 'Msg 4'
-        }
+          msg4: 'Msg 4',
+        },
       });
     });
 
@@ -126,7 +126,7 @@ describe('I18n', () => {
       obj.setLocale('en');
       obj.setMessages({
         en: { msg1 },
-        it: { msg1: `${msg1} it` }
+        it: { msg1: `${msg1} it` },
       });
       expect(obj.t('msg2')).toBe(undefined);
       expect(obj.t('msg1')).toBe(msg1);
@@ -141,10 +141,10 @@ describe('I18n', () => {
           key1: {
             msg1,
             key2: {
-              msg2
-            }
-          }
-        }
+              msg2,
+            },
+          },
+        },
       });
       expect(obj.t('key1.msg1')).toBe(msg1);
       expect(obj.t('key1.key2.msg2')).toBe(msg2);
@@ -158,7 +158,7 @@ describe('I18n', () => {
       obj.setLocale('en');
       obj.setMessages({
         en: { msg1 },
-        it: { msg1: msg1Alt }
+        it: { msg1: msg1Alt },
       });
       expect(obj.t('msg1', { l: 'it' })).toBe(msg1Alt);
     });
@@ -168,7 +168,7 @@ describe('I18n', () => {
       obj.setLocale('it');
       obj.setMessages({
         en: { msg1 },
-        it: {}
+        it: {},
       });
       expect(obj.t('msg1')).toBe(msg1);
     });
@@ -179,12 +179,10 @@ describe('I18n', () => {
       obj.setLocale('en');
       obj.setMessages({
         en: { msg1 },
-        it: { msg1: msg1Alt }
+        it: { msg1: msg1Alt },
       });
       expect(obj.t('msg1', { params: { test: 'Hello' } })).toBe('Msg 1 Hello');
-      expect(obj.t('msg1', { l: 'it', params: { test: 'Hello' } })).toBe(
-        'Msg 1 Hello it'
-      );
+      expect(obj.t('msg1', { l: 'it', params: { test: 'Hello' } })).toBe('Msg 1 Hello it');
     });
 
     test('i18n events', () => {

test/specs/keymaps/index.js

@@ -1,4 +1,4 @@
-import Editor from 'editor/index';
+import Editor from 'editor';
 
 describe('Keymaps', () => {
   describe('Main', () => {
@@ -7,7 +7,7 @@ describe('Keymaps', () => {
     let editor;
 
     beforeEach(() => {
-      editor = Editor({ keymaps: { defaults: [] } }).init();
+      editor = new Editor({ keymaps: { defaults: [] } }).init();
       em = editor.getModel();
       em.loadOnStart();
       obj = editor.Keymaps;
@@ -64,13 +64,13 @@ describe('Keymaps', () => {
       it('Should run the handler', () => {
         const handler = {
           run: jest.fn(),
-          callRun: jest.fn()
+          callRun: jest.fn(),
         };
         obj.add('test', 'ctrl+a', handler);
         const keyboardEvent = new KeyboardEvent('keydown', {
           keyCode: 65,
           which: 65,
-          ctrlKey: true
+          ctrlKey: true,
         });
         document.dispatchEvent(keyboardEvent);
 
@@ -86,13 +86,13 @@ describe('Keymaps', () => {
       it('Should not run the handler', () => {
         const handler = {
           run: jest.fn(),
-          callRun: jest.fn()
+          callRun: jest.fn(),
         };
         obj.add('test', 'ctrl+a', handler);
         const keyboardEvent = new KeyboardEvent('keydown', {
           keyCode: 65,
           which: 65,
-          ctrlKey: true
+          ctrlKey: true,
         });
         document.dispatchEvent(keyboardEvent);
 
@@ -102,13 +102,13 @@ describe('Keymaps', () => {
       it('Should run the handler if checked as force', () => {
         const handler = {
           run: jest.fn(),
-          callRun: jest.fn()
+          callRun: jest.fn(),
         };
         obj.add('test', 'ctrl+a', handler, { force: true });
         const keyboardEvent = new KeyboardEvent('keydown', {
           keyCode: 65,
           which: 65,
-          ctrlKey: true
+          ctrlKey: true,
         });
         document.dispatchEvent(keyboardEvent);