Browse Source

Prevent NaN in updatePosition

pull/3905/head
Artur Arseniev 5 years ago
parent
commit
7d90ecb2ad
  1. 5
      src/rich_text_editor/index.js
  2. 1
      test/specs/css_composer/model/CssModels.js

5
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;
},
/**

1
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);

Loading…
Cancel
Save