From 7d90ecb2adb765edd1881c2e54bb714225606970 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Tue, 5 Oct 2021 16:49:41 +0200 Subject: [PATCH] Prevent NaN in updatePosition --- src/rich_text_editor/index.js | 5 ++--- test/specs/css_composer/model/CssModels.js | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rich_text_editor/index.js b/src/rich_text_editor/index.js index 1f533bdb6..13c656964 100644 --- a/src/rich_text_editor/index.js +++ b/src/rich_text_editor/index.js @@ -280,9 +280,8 @@ export default () => { event: 'rteToolbarPosUpdate', left: 0 }); - - style.top = pos.top + un; - style.left = pos.left + un; + style.top = (pos.top || 0) + un; + style.left = (pos.left || 0) + un; }, /** diff --git a/test/specs/css_composer/model/CssModels.js b/test/specs/css_composer/model/CssModels.js index e92ecfd6f..9c9ac0cda 100644 --- a/test/specs/css_composer/model/CssModels.js +++ b/test/specs/css_composer/model/CssModels.js @@ -49,6 +49,7 @@ describe('CssRule', () => { var s2 = obj.get('selectors').add({ name: 'test2' }); obj.set('state', 'hover'); obj.set('mediaText', '1000'); + obj.set('atRuleType', 'media'); expect(obj.compare([s1, s2])).toEqual(false); expect(obj.compare([s1, s2], 'hover')).toEqual(false); expect(obj.compare([s2, s1], 'hover', '1000')).toEqual(true);