From 56f8bbc144910cd8329b33129c126d4117438d4e Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Wed, 17 Oct 2018 20:32:49 -0500
Subject: [PATCH] Null dynamic previews on plain editor

---
 app/assets/javascripts/app/controllers/editor.js | 5 +++++
 app/assets/stylesheets/app/_notes.scss           | 1 +
 vendor/assets/javascripts/angular-sanitize.js    | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/editor.js b/app/assets/javascripts/app/controllers/editor.js
index e040a8535..4797eea35 100644
--- a/app/assets/javascripts/app/controllers/editor.js
+++ b/app/assets/javascripts/app/controllers/editor.js
@@ -346,6 +346,11 @@ angular.module('app')
     }
 
     this.contentChanged = function() {
+
+      // Clear dynamic previews if using plain editor
+      this.note.content.preview_html = null;
+      this.note.content.preview_plain = null;
+
       // content changes should bypass manual debouncer as we use the built in ng-model-options debouncer
       this.changesMade({bypassDebouncer: true});
     }
diff --git a/app/assets/stylesheets/app/_notes.scss b/app/assets/stylesheets/app/_notes.scss
index 673a5e965..ca5b8a4ac 100644
--- a/app/assets/stylesheets/app/_notes.scss
+++ b/app/assets/stylesheets/app/_notes.scss
@@ -147,6 +147,7 @@
 
       .html-preview {
         margin-top: 4px;
+        margin-bottom: 4px;
       }
     }
 
diff --git a/vendor/assets/javascripts/angular-sanitize.js b/vendor/assets/javascripts/angular-sanitize.js
index 22aa6800d..c2c794fef 100644
--- a/vendor/assets/javascripts/angular-sanitize.js
+++ b/vendor/assets/javascripts/angular-sanitize.js
@@ -252,7 +252,7 @@ function $SanitizeProvider() {
   // Safe Block Elements - HTML5
   var blockElements = extend({}, optionalEndTagBlockElements, toMap('address,article,' +
           'aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,' +
-          'h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul'));
+          'h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul,progress'));
 
   // Inline Elements - HTML5
   var inlineElements = extend({}, optionalEndTagInlineElements, toMap('a,abbr,acronym,b,' +
@@ -268,7 +268,7 @@ function $SanitizeProvider() {
           'radialGradient,rect,stop,svg,switch,text,title,tspan');
 
   // Blocked Elements (will be stripped)
-  var blockedElements = toMap('script,style');
+  var blockedElements = toMap('script');
 
   var validElements = extend({},
                                      voidElements,