From 05401dcbf7666be3a0e3d30f9ad2942077293205 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Fri, 13 May 2022 15:09:52 +0200 Subject: [PATCH] Fixes post components refactor --- src/abstract/Module.ts | 3 ++- src/dom_components/index.ts | 2 +- src/dom_components/view/ComponentView.js | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/abstract/Module.ts b/src/abstract/Module.ts index 0bbea25a7..da930e0c6 100644 --- a/src/abstract/Module.ts +++ b/src/abstract/Module.ts @@ -74,7 +74,8 @@ export default abstract class Module } getConfig(name?: string) { - return name ? this.config.name : this.config; + // @ts-ignore + return name ? this.config[name] : this.config; } __logWarn(str: string, opts = {}) { diff --git a/src/dom_components/index.ts b/src/dom_components/index.ts index 7520681a6..d9d2d516a 100644 --- a/src/dom_components/index.ts +++ b/src/dom_components/index.ts @@ -454,7 +454,7 @@ export default class ComponentManager extends ItemManagerModule { const fn = target[next]; const parentFn = srcToExt.prototype[next]; if (fn && parentFn) { - res[next] = (...args: any[]) => { + res[next] = function (...args: any[]) { parentFn.bind(this)(...args); fn.bind(this)(...args); }; diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js index db589d255..67e9dd71e 100644 --- a/src/dom_components/view/ComponentView.js +++ b/src/dom_components/view/ComponentView.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -import { isEmpty, each, keys } from 'underscore'; +import { isEmpty, each, keys, result } from 'underscore'; import Components from '../model/Components'; import ComponentsView from './ComponentsView'; import Selectors from 'selector_manager/model/Selectors'; @@ -7,6 +7,10 @@ import { replaceWith } from 'utils/dom'; import { setViewEl } from 'utils/mixins'; export default class ComponentView extends Backbone.View { + static getEvents() { + return result(this.prototype, 'events'); + } + className() { return this.getClasses(); } @@ -45,7 +49,7 @@ export default class ComponentView extends Backbone.View { this.initClasses(); this.initComponents({ avoidRender: 1 }); this.events = { - ...this.events, + ...this.constructor.getEvents(), dragstart: 'handleDragStart', }; this.delegateEvents();