Browse Source

Merge branch 'bernesto-dev' into dev

pull/5907/head
Artur Arseniev 2 years ago
parent
commit
8a14357dc6
  1. 2
      docs/modules/Assets.md
  2. 3
      src/commands/view/ShowOffset.ts
  3. 2
      src/selector_manager/model/Selector.ts
  4. 4
      test/specs/selector_manager/model/SelectorModels.ts

2
docs/modules/Assets.md

@ -69,7 +69,7 @@ const editor = grapesjs.init({
```
If you want a complete list of available properties check out the source [AssetImage Model](https://github.com/GrapesJS/grapesjs/blob/dev/src/asset_manager/model/AssetImage.js)
If you want a complete list of available properties check out the source [AssetImage Model](https://github.com/GrapesJS/grapesjs/blob/dev/src/asset_manager/model/AssetImage.ts)
The built-in Asset Manager modal is implemented and is showing up when requested. By default, you can make it appear by dragging Image Components in canvas, double clicking on images and all other stuff related to images (eg. CSS styling)

3
src/commands/view/ShowOffset.ts

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

2
src/selector_manager/model/Selector.ts

@ -191,7 +191,7 @@ export default class Selector extends Model<SelectorProps & { [key: string]: unk
* @private
*/
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', () => {
let obj: Selector;
const nameToEscape = '@Te s:T*';
const nameEscaped = '@Te-s:T-';
const nameToEscape = '@Te sT:*[]().%/+#';
const nameEscaped = '@Te-sT:-[]().%/+#';
beforeEach(() => {
obj = new Selector({});

Loading…
Cancel
Save