From f05ddb5cd1c794dc85d13b5dbf2d092c39f9e32f Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Fri, 10 Mar 2017 14:31:17 -0600 Subject: [PATCH] fixes change editor glitch --- app/assets/javascripts/app/frontend/controllers/editor.js | 3 +++ app/assets/stylesheets/app/_editor.scss | 1 + app/assets/templates/frontend/editor.html.haml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/frontend/controllers/editor.js b/app/assets/javascripts/app/frontend/controllers/editor.js index 547dbe0f4..4f5e67417 100644 --- a/app/assets/javascripts/app/frontend/controllers/editor.js +++ b/app/assets/javascripts/app/frontend/controllers/editor.js @@ -51,6 +51,7 @@ angular.module('app.frontend') }.bind(this)); this.setNote = function(note, oldNote) { + this.noteReady = false; var currentEditor = this.customEditor; this.customEditor = null; this.showExtensions = false; @@ -60,6 +61,7 @@ angular.module('app.frontend') var setEditor = function(editor) { this.customEditor = editor; this.postNoteToExternalEditor(); + this.noteReady = true; }.bind(this) var editor = this.editorForNote(note); @@ -75,6 +77,7 @@ angular.module('app.frontend') } } else { this.customEditor = null; + this.noteReady = true; } if(note.safeText().length == 0 && note.dummy) { diff --git a/app/assets/stylesheets/app/_editor.scss b/app/assets/stylesheets/app/_editor.scss index 8b8568a8a..ed7fe932c 100644 --- a/app/assets/stylesheets/app/_editor.scss +++ b/app/assets/stylesheets/app/_editor.scss @@ -5,6 +5,7 @@ $heading-height: 75px; display: flex; flex-direction: column; overflow-y: hidden; + background-color: white; &.fullscreen { width: 100%; diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/frontend/editor.html.haml index c07a82470..5394baecd 100644 --- a/app/assets/templates/frontend/editor.html.haml +++ b/app/assets/templates/frontend/editor.html.haml @@ -38,7 +38,7 @@ %span.sr-only %contextual-extensions-menu{"ng-if" => "ctrl.showExtensions", "item" => "ctrl.note"} - .editor-content{"ng-class" => "{'fullscreen' : ctrl.fullscreen }"} + .editor-content{"ng-if" => "ctrl.noteReady", "ng-class" => "{'fullscreen' : ctrl.fullscreen }"} %iframe#editor-iframe{"ng-if" => "ctrl.customEditor", "ng-src" => "{{ctrl.customEditor.url | trusted}}", "frameBorder" => "0", "style" => "width: 100%;"} %textarea.editable#note-text-editor{"ng-if" => "!ctrl.customEditor", "ng-class" => "{'fullscreen' : ctrl.fullscreen }", "ng-model" => "ctrl.note.text", "ng-change" => "ctrl.contentChanged()", "ng-click" => "ctrl.clickedTextArea()", "ng-focus" => "ctrl.onContentFocus()"}