Browse Source

Add tests

pull/5907/head
Artur Arseniev 2 years ago
parent
commit
250d5605d8
  1. 7
      src/commands/view/ShowOffset.ts
  2. 2
      src/selector_manager/model/Selector.ts
  3. 4
      test/specs/selector_manager/model/SelectorModels.ts

7
src/commands/view/ShowOffset.ts

@ -1,7 +1,6 @@
import { isUndefined } from 'underscore'; import { isUndefined } from 'underscore';
import { CanvasSpotBuiltInTypes } from '../../canvas/model/CanvasSpot'; import { CanvasSpotBuiltInTypes } from '../../canvas/model/CanvasSpot';
import { $ } from '../../common'; import { $ } from '../../common';
import { isTextNode } from '../../utils/dom';
import { CommandObject } from './CommandAbstract'; import { CommandObject } from './CommandAbstract';
export default { export default {
@ -18,11 +17,7 @@ export default {
const zoom = this.em.getZoomDecimal(); const zoom = this.em.getZoomDecimal();
const el = opt.el as HTMLElement | undefined; const el = opt.el as HTMLElement | undefined;
if (!(el instanceof HTMLElement)) { if (!config.showOffsets || !(el instanceof HTMLElement) || (!config.showOffsetsSelected && state == 'Fixed')) {
return;
}
if (!config.showOffsets || !el || isTextNode(el) || (!config.showOffsetsSelected && state == 'Fixed')) {
editor.stopCommand(`${this.id}`, opts); editor.stopCommand(`${this.id}`, opts);
return; return;
} }

2
src/selector_manager/model/Selector.ts

@ -191,7 +191,7 @@ export default class Selector extends Model<SelectorProps & { [key: string]: unk
* @private * @private
*/ */
static escapeName(name: string) { static escapeName(name: string) {
return `${name}`.trim().replace(/([^a-z0-9\w\-\\:@\\/()\.%\+\[\]]+)/gi, '-'); return `${name}`.trim().replace(/([^a-z0-9\w\-\\:@\\/#()\.%\+\[\]]+)/gi, '-');
} }
} }

4
test/specs/selector_manager/model/SelectorModels.ts

@ -3,8 +3,8 @@ import Selectors from '../../../../src/selector_manager/model/Selectors';
describe('Selector', () => { describe('Selector', () => {
let obj: Selector; let obj: Selector;
const nameToEscape = '@Te s:T*'; const nameToEscape = '@Te sT:*[]().%/+#';
const nameEscaped = '@Te-s:T-'; const nameEscaped = '@Te-sT:-[]().%/+#';
beforeEach(() => { beforeEach(() => {
obj = new Selector({}); obj = new Selector({});

Loading…
Cancel
Save