From f0c7d9920be2f574b6791446ce557674a62cd668 Mon Sep 17 00:00:00 2001 From: Alex Ritter Date: Fri, 13 May 2022 11:21:54 +0200 Subject: [PATCH] Change to the requested format --- src/dom_components/view/ComponentFrameView.js | 4 +++- src/dom_components/view/ComponentImageView.js | 21 +++++++++++-------- src/dom_components/view/ComponentLabelView.js | 4 +++- src/dom_components/view/ComponentMapView.js | 8 +++++-- .../view/ComponentScriptView.js | 8 +++++-- src/dom_components/view/ComponentTextView.js | 10 +++++---- src/dom_components/view/ComponentVideoView.js | 8 +++++-- 7 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/dom_components/view/ComponentFrameView.js b/src/dom_components/view/ComponentFrameView.js index 437b6949c..580982df7 100644 --- a/src/dom_components/view/ComponentFrameView.js +++ b/src/dom_components/view/ComponentFrameView.js @@ -2,7 +2,9 @@ import ComponentView from './ComponentView'; import { createEl, find, attrUp } from 'utils/dom'; export default class ComponentFrameView extends ComponentView.extend { - tagName = 'div'; + tagName() { + return 'div'; + } initialize(...args) { ComponentView.prototype.initialize.apply(this, args); diff --git a/src/dom_components/view/ComponentImageView.js b/src/dom_components/view/ComponentImageView.js index e80c0b79f..ae67f3c1c 100644 --- a/src/dom_components/view/ComponentImageView.js +++ b/src/dom_components/view/ComponentImageView.js @@ -2,15 +2,18 @@ import { isString } from 'underscore'; import ComponentView from './ComponentView'; export default class ComponentImageView extends ComponentView { - tagName = 'img'; - - events = { - dblclick: 'onActive', - click: 'initResize', - error: 'onError', - load: 'onLoad', - dragstart: 'noDrag', - }; + tagName() { + return 'img'; + } + events() { + return { + dblclick: 'onActive', + click: 'initResize', + error: 'onError', + load: 'onLoad', + dragstart: 'noDrag', + }; + } initialize(o) { ComponentView.prototype.initialize.apply(this, arguments); diff --git a/src/dom_components/view/ComponentLabelView.js b/src/dom_components/view/ComponentLabelView.js index 5593309b7..ae32a7929 100644 --- a/src/dom_components/view/ComponentLabelView.js +++ b/src/dom_components/view/ComponentLabelView.js @@ -1,5 +1,7 @@ import ComponentLinkView from './ComponentLinkView'; export default class ComponentLabelView extends ComponentLinkView { - tagName = 'span'; // Avoid Firefox bug with label editing #2332 + tagName() { + return 'span'; + } // Avoid Firefox bug with label editing #2332 } diff --git a/src/dom_components/view/ComponentMapView.js b/src/dom_components/view/ComponentMapView.js index e5227b884..c0ecb0057 100644 --- a/src/dom_components/view/ComponentMapView.js +++ b/src/dom_components/view/ComponentMapView.js @@ -1,9 +1,13 @@ import ComponentView from './ComponentImageView'; export default class ComponentMapView extends ComponentView { - tagName = 'div'; + tagName() { + return 'div'; + } - events = {}; + events() { + return {}; + } initialize(o) { ComponentView.prototype.initialize.apply(this, arguments); diff --git a/src/dom_components/view/ComponentScriptView.js b/src/dom_components/view/ComponentScriptView.js index 99061285b..8fc9200f2 100644 --- a/src/dom_components/view/ComponentScriptView.js +++ b/src/dom_components/view/ComponentScriptView.js @@ -1,9 +1,13 @@ import ComponentView from './ComponentImageView'; export default class ComponentScriptView extends ComponentView { - tagName = 'script'; + tagName() { + return 'script'; + } - events = {}; + events() { + return {}; + } render() { const { model, em } = this; diff --git a/src/dom_components/view/ComponentTextView.js b/src/dom_components/view/ComponentTextView.js index 5c5a97906..02a5b5eb6 100644 --- a/src/dom_components/view/ComponentTextView.js +++ b/src/dom_components/view/ComponentTextView.js @@ -5,10 +5,12 @@ import { bindAll } from 'underscore'; const compProt = ComponentView.prototype; export default class ComponentTextView extends ComponentView { - events = { - dblclick: 'onActive', - input: 'onInput', - }; + events() { + return { + dblclick: 'onActive', + input: 'onInput', + }; + } initialize(o) { compProt.initialize.apply(this, arguments); diff --git a/src/dom_components/view/ComponentVideoView.js b/src/dom_components/view/ComponentVideoView.js index e62d0b070..3f1b75b10 100644 --- a/src/dom_components/view/ComponentVideoView.js +++ b/src/dom_components/view/ComponentVideoView.js @@ -2,9 +2,13 @@ import ComponentView from './ComponentImageView'; import OComponentView from './ComponentView'; export default class ComponentVideoView extends ComponentView { - tagName = 'div'; + tagName() { + return 'div'; + } - events = {}; + events() { + return {}; + } initialize(o) { OComponentView.prototype.initialize.apply(this, arguments);