Merge branch 'next' of github.com:codex-team/editor.js into reafctori…

…ng/tools

src/components/modules/toolbar/inline.ts

@@ -621,7 +621,9 @@ export default class InlineToolbar extends Module<InlineToolbarNodes> {
     const shortcut = this.getToolShortcut(tool.name);
 
     if (shortcut) {
-      this.enableShortcuts(instance, shortcut);
+      try {
+        this.enableShortcuts(instance, shortcut);
+      } catch (e) {}
     }
 
     /**

src/components/modules/tools.ts

@@ -16,6 +16,8 @@ import InlineTool from '../tools/inline';
 import BlockTool from '../tools/block';
 import BlockTune from '../tools/tune';
 import BaseTool from '../tools/base';
+import Stub from '../tools/stub';
+import EventsDispatcher from '../utils/events';
 
 /**
  * @module Editor.js Tools Submodule
@@ -153,17 +155,11 @@ export default class Tools extends Module {
    * @private
    */
   private _inlineTools: Map<string, InlineTool> = null;
-  private _blockTools: Map<string, BlockTool> = null;
 
   /**
-   * @class
-   *
-   * @param {EditorConfig} config - Editor's configuration
-   * @param {EventsDispatcher} eventsDispatcher - Editor's event dispatcher
+   * Cache for the prepared block tools
    */
-  constructor({ config }) {
-    super({ config });
-  }
+  private _blockTools: Map<string, BlockTool> = null;
 
   /**
    * Returns internal tools