Browse Source

Remove properly frame element

pull/3563/head
Artur Arseniev 5 years ago
parent
commit
a2fd135439
  1. 4
      src/canvas/view/FrameWrapView.js
  2. 5
      src/utils/dom.js

4
src/canvas/view/FrameWrapView.js

@ -1,7 +1,7 @@
import Backbone from 'backbone'; import Backbone from 'backbone';
import FrameView from './FrameView'; import FrameView from './FrameView';
import { bindAll, isNumber, isNull, debounce } from 'underscore'; import { bindAll, isNumber, isNull, debounce } from 'underscore';
import { createEl } from 'utils/dom'; import { createEl, removeEl } from 'utils/dom';
import Dragger from 'utils/Dragger'; import Dragger from 'utils/Dragger';
export default Backbone.View.extend({ export default Backbone.View.extend({
@ -71,6 +71,7 @@ export default Backbone.View.extend({
remove(opts) { remove(opts) {
this.frame.remove(opts); this.frame.remove(opts);
removeEl(this.elTools);
Backbone.View.prototype.remove.apply(this, arguments); Backbone.View.prototype.remove.apply(this, arguments);
['frame', 'dragger', 'cv', 'em', 'canvas', 'elTools'].forEach( ['frame', 'dragger', 'cv', 'em', 'canvas', 'elTools'].forEach(
i => (this[i] = 0) i => (this[i] = 0)
@ -160,6 +161,7 @@ export default Backbone.View.extend({
render() { render() {
const { frame, $el, ppfx, cv, model, el } = this; const { frame, $el, ppfx, cv, model, el } = this;
const { onRender } = model.attributes; const { onRender } = model.attributes;
frame && frame.remove();
this.__handleSize(); this.__handleSize();
frame.render(); frame.render();
$el $el

5
src/utils/dom.js

@ -10,6 +10,11 @@ export const motionsEv =
export const isDoc = el => el && el.nodeType === 9; export const isDoc = el => el && el.nodeType === 9;
export const removeEl = el => {
const parent = el && el.parentNode;
parent && parent.removeChild(el);
};
export const isVisible = el => { export const isVisible = el => {
return ( return (
el && !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length) el && !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length)

Loading…
Cancel
Save