Browse Source

Hide canvas tools on zoom

pull/1800/head
Artur Arseniev 8 years ago
parent
commit
d72a010e0d
  1. 6
      src/canvas/view/CanvasView.js
  2. 9
      src/commands/view/SelectComponent.js

6
src/canvas/view/CanvasView.js

@ -2,6 +2,7 @@ import Backbone from 'backbone';
import { on, off, getElement } from 'utils/mixins';
const FrameView = require('./FrameView');
const $ = Backbone.$;
let timerZoom;
module.exports = Backbone.View.extend({
events: {
@ -35,9 +36,14 @@ module.exports = Backbone.View.extend({
},
onZoomChange() {
const { em } = this;
const defOpts = { preserveSelected: 1 };
this.frame.el.style.transform = `scale(${this.getZoom()})`;
this.clearOff();
this.onFrameScroll();
em.stopDefault(defOpts);
timerZoom && clearTimeout(timerZoom);
timerZoom = setTimeout(() => em.runDefault(defOpts));
},
getZoom() {

9
src/commands/view/SelectComponent.js

@ -106,8 +106,8 @@ module.exports = {
* @param {Object} e
* @private
*/
onOut(e) {
e.stopPropagation();
onOut(ev) {
ev && ev.stopPropagation();
this.hideBadge();
this.hideHighlighter();
this.hideElementOffset();
@ -138,7 +138,8 @@ module.exports = {
* @param {Object} pos
*/
hideElementOffset(el, pos) {
this.editor.stopCommand('show-offset');
const { editor } = this;
editor && editor.stopCommand('show-offset');
},
/**
@ -669,7 +670,7 @@ module.exports = {
this.stopSelectComponent();
!opts.preserveSelected && em.setSelected(null);
this.clean();
this.hideBadge();
this.onOut();
this.hideFixedElementOffset();
this.canvas.getToolbarEl().style.display = 'none';

Loading…
Cancel
Save