Browse Source

Hide toolbars properly

symbols-2
Artur Arseniev 6 years ago
parent
commit
549746aed4
  1. 2
      src/canvas/view/FrameWrapView.js
  2. 30
      src/commands/view/SelectComponent.js

2
src/canvas/view/FrameWrapView.js

@ -175,7 +175,7 @@ export default Backbone.View.extend({
'div', 'div',
{ {
class: `${ppfx}tools`, class: `${ppfx}tools`,
style: 'pointer-events:none; opacity: 0' style: 'pointer-events:none; display: none'
}, },
` `
<div class="${ppfx}highlighter" data-hl></div> <div class="${ppfx}highlighter" data-hl></div>

30
src/commands/view/SelectComponent.js

@ -224,7 +224,7 @@ export default {
toggleToolsEl(on, view, opts = {}) { toggleToolsEl(on, view, opts = {}) {
const el = opts.el || this.canvas.getToolsEl(view); const el = opts.el || this.canvas.getToolsEl(view);
el && (el.style.opacity = on ? 1 : 0); el && (el.style.display = on ? '' : 'none');
return el || {}; return el || {};
}, },
@ -509,29 +509,19 @@ export default {
* @param {Object} mod * @param {Object} mod
*/ */
updateToolbar(mod) { updateToolbar(mod) {
var em = this.config.em; const { em } = this.config;
var model = mod == em ? em.getSelected() : mod; const model = mod == em ? em.getSelected() : mod;
var toolbarEl = this.canvas.getToolbarEl(); const toolbarEl = this.canvas.getToolbarEl();
var toolbarStyle = toolbarEl.style; const toolbarStyle = toolbarEl.style;
const toolbar = model.get('toolbar');
if (!model) { const showToolbar = em.get('Config').showToolbar;
// By putting `toolbarStyle.display = 'none'` will cause kind
// of freezed effect with component selection (probably by iframe if (model && showToolbar && toolbar && toolbar.length) {
// switching)
toolbarStyle.opacity = 0;
return;
}
var toolbar = model.get('toolbar');
var showToolbar = em.get('Config').showToolbar;
if (showToolbar && toolbar && toolbar.length) {
toolbarStyle.opacity = '';
toolbarStyle.display = ''; toolbarStyle.display = '';
if (!this.toolbar) { if (!this.toolbar) {
toolbarEl.innerHTML = ''; toolbarEl.innerHTML = '';
this.toolbar = new Toolbar(toolbar); this.toolbar = new Toolbar(toolbar);
var toolbarView = new ToolbarView({ const toolbarView = new ToolbarView({
collection: this.toolbar, collection: this.toolbar,
editor: this.editor, editor: this.editor,
em em

Loading…
Cancel
Save