From f1b02a329f24ee00306cd80e1977932e3ed1b1d8 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 6 Jul 2016 13:41:22 +0200 Subject: [PATCH] Update highlighters --- src/canvas/main.js | 8 -------- src/canvas/view/CanvasView.js | 5 ++--- src/commands/view/SelectComponent.js | 5 ----- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/canvas/main.js b/src/canvas/main.js index 393ddcfe7..09b251c8f 100644 --- a/src/canvas/main.js +++ b/src/canvas/main.js @@ -84,14 +84,6 @@ define(function(require) { return this.CanvasView.hlEl; }, - /** - * Returns selector highlighter element - * @return {HTMLElement} - */ - getHighlighterSel: function(){ - return this.CanvasView.hlSelEl; - }, - /** * Returns badge element * @return {HTMLElement} diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index 4f89bbc52..db87608c6 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -12,13 +12,11 @@ function(Backbone, FrameView) { this.frame = new FrameView({ model: this.model.get('frame')}); this.toolsEl = $('
', { id: this.ppfx + 'tools' }).get(0); this.hlEl = $('
', { class: this.ppfx + 'highlighter' }).get(0); - this.hlSelEl = $('
', { class: this.ppfx + 'highlighter-sel' }).get(0); this.badgeEl = $('
', {class: this.ppfx + 'badge'}).get(0); this.placerEl = $('
', {class: this.ppfx + 'placeholder'}).get(0); this.placerIntEl = $('
', {class: this.ppfx + 'placeholder-int'}).get(0); this.placerEl.appendChild(this.placerIntEl); this.toolsEl.appendChild(this.hlEl); - this.toolsEl.appendChild(this.hlSelEl); this.toolsEl.appendChild(this.badgeEl); this.toolsEl.appendChild(this.placerEl); }, @@ -35,7 +33,8 @@ function(Backbone, FrameView) { var conf = this.config.em.get('Config'); body.append(wrap.render()).append(cssc.render()); var protCss = conf.protectedCss; - var frameCss = '.' + this.ppfx + 'dashed *{outline: 1px dashed rgba(170,170,170,0.7); outline-offset: -2px;}'; + var frameCss = '.' + this.ppfx + 'dashed *{outline: 1px dashed rgba(170,170,170,0.7); outline-offset: -2px}' + + '.' + this.ppfx + 'comp-selected{outline: 3px solid #3b97e3 !important}'; if(protCss) body.append(''); } diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js index ce27f60ed..d1ffc4203 100644 --- a/src/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -161,10 +161,7 @@ define(function() { if(nMd){ this.editorModel.set('selectedComponent', nMd); nMd.set('status','selected'); - if(!this.hlSel) - this.hlSel = $(this.canvas.getHighlighterSel()); var elP = this.getElementPos($el); - this.hlSel.css({left: elP.left, top: elP.topP, height: elP.height, width: elP.width }); } }, @@ -270,8 +267,6 @@ define(function() { stop: function() { if(!this.selEl) this.selEl = $(this.getCanvasBody()).find('*'); - if(this.hlSel) - this.hlSel.css({ left: -10000, top:-10000 }); this.frameOff = this.canvasOff = this.adjScroll = null; $(this.frameEl.contentWindow).off('keydown');