Browse Source

Fix errors on page remove

pull/3563/head
Artur Arseniev 5 years ago
parent
commit
40df1ab80a
  1. 11
      src/dom_components/index.js
  2. 40
      src/editor/model/Editor.js

11
src/dom_components/index.js

@ -350,11 +350,9 @@ export default () => {
* @private
*/
getComponent() {
return this.em
.get('PageManager')
.getSelected()
.getMainFrame()
.getComponent();
const sel = this.em.get('PageManager').getSelected();
const frame = sel && sel.getMainFrame();
return frame && frame.getComponent();
},
/**
@ -399,7 +397,8 @@ export default () => {
* wrapperChildren.remove(comp2);
*/
getComponents() {
return this.getWrapper().get('components');
const wrp = this.getWrapper();
return wrp && wrp.get('components');
},
/**

40
src/editor/model/Editor.js

@ -524,12 +524,14 @@ export default Backbone.Model.extend({
const wrapperIsBody = config.wrapperIsBody;
const js = config.jsInHtml ? this.getJs(opts) : '';
var wrp = opts.component || this.get('DomComponents').getComponent();
var html = this.get('CodeManager').getCode(wrp, 'html', {
exportWrapper,
wrapperIsBody,
...optsHtml,
...opts
});
var html = wrp
? this.get('CodeManager').getCode(wrp, 'html', {
exportWrapper,
wrapperIsBody,
...optsHtml,
...opts
})
: '';
html += js ? `<script>${js}</script>` : '';
return html;
},
@ -552,15 +554,15 @@ export default Backbone.Model.extend({
const wrp = opts.component || this.get('DomComponents').getComponent();
const protCss = !avoidProt ? config.protectedCss : '';
return (
protCss +
this.get('CodeManager').getCode(wrp, 'css', {
cssc,
wrapperIsBody,
keepUnusedStyles,
...optsCss
})
);
return wrp
? protCss +
this.get('CodeManager').getCode(wrp, 'css', {
cssc,
wrapperIsBody,
keepUnusedStyles,
...optsCss
})
: '';
},
/**
@ -570,9 +572,11 @@ export default Backbone.Model.extend({
*/
getJs(opts = {}) {
var wrp = opts.component || this.get('DomComponents').getWrapper();
return this.get('CodeManager')
.getCode(wrp, 'js')
.trim();
return wrp
? this.get('CodeManager')
.getCode(wrp, 'js')
.trim()
: '';
},
/**

Loading…
Cancel
Save