From c215c565e76726be4905f7de7448f8c072fc6bb8 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Fri, 21 Apr 2017 01:54:05 +0200 Subject: [PATCH] Move essential styles inside Canvas --- src/canvas/view/CanvasView.js | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index 01814934d..86a9fc318 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -41,7 +41,7 @@ function(Backbone, FrameView) { frame.el.onload = function () { var scripts = that.config.scripts.slice(0), // clone counter = 0; - + function appendScript(scripts) { if (scripts.length > 0) { var script = document.createElement('script'); @@ -61,7 +61,7 @@ function(Backbone, FrameView) { * Render inside frame's body * @private */ - renderBody: function(){ + renderBody: function() { var wrap = this.model.get('frame').get('wrapper'); var em = this.config.em; if(wrap) { @@ -71,19 +71,22 @@ function(Backbone, FrameView) { var conf = em.get('Config'); body.append(wrap.render()).append(cssc.render()); var protCss = conf.protectedCss; - var frameCss = '.' + ppfx + 'dashed :not([contenteditable]) > *{outline: 1px dashed rgba(170,170,170,0.7); outline-offset: -2px}' + - '.' + ppfx + 'comp-selected{outline: 3px solid #3b97e3 !important}' + - '.' + ppfx + 'no-select{user-select: none; -webkit-user-select:none; -moz-user-select: none}'+ - '.' + ppfx + 'freezed{opacity: 0.5; pointer-events: none}' + - '.' + ppfx + 'no-pointer{pointer-events: none}' + - '.' + ppfx + 'plh-image{background:#f5f5f5; border:none; height:50px; width:50px; display:block; outline:3px solid #ffca6f; cursor:pointer}' + - '.' + ppfx + 'grabbing{cursor: grabbing; cursor: -webkit-grabbing}' + - '* ::-webkit-scrollbar-track {background: rgba(0, 0, 0, 0.1)}' + - '* ::-webkit-scrollbar-thumb {background: rgba(255, 255, 255, 0.2)}' + - '* ::-webkit-scrollbar {width: 10px}' + - (conf.canvasCss || ''); - if(protCss) - body.append(''); + + // I need all this styles to make the editor work properly + var frameCss = '* {box-sizing: border-box;} body{margin:0;height:auto;background-color:#fff} #wrapper{min-height:100%; overflow:auto}' + + '.' + ppfx + 'dashed :not([contenteditable]) > *{outline: 1px dashed rgba(170,170,170,0.7); outline-offset: -2px}' + + '.' + ppfx + 'comp-selected{outline: 3px solid #3b97e3 !important}' + + '.' + ppfx + 'no-select{user-select: none; -webkit-user-select:none; -moz-user-select: none}'+ + '.' + ppfx + 'freezed{opacity: 0.5; pointer-events: none}' + + '.' + ppfx + 'no-pointer{pointer-events: none}' + + '.' + ppfx + 'plh-image{background:#f5f5f5; border:none; height:50px; width:50px; display:block; outline:3px solid #ffca6f; cursor:pointer}' + + '.' + ppfx + 'grabbing{cursor: grabbing; cursor: -webkit-grabbing}' + + '* ::-webkit-scrollbar-track {background: rgba(0, 0, 0, 0.1)}' + + '* ::-webkit-scrollbar-thumb {background: rgba(255, 255, 255, 0.2)}' + + '* ::-webkit-scrollbar {width: 10px}' + + (conf.canvasCss || ''); + frameCss += protCss || ''; + body.append(''); body.append(this.getJsContainer()); em.trigger('loaded'); this.frame.el.contentWindow.onscroll = this.onFrameScroll;