From 6e21507c7c838c23fa3e74fc1a34b347a6619071 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 5 Jan 2021 17:21:45 +0800
Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js
 Roo/bootstrap/Markdown.js

---
 Roo/bootstrap/Markdown.js | 7 ++-----
 roojs-bootstrap-debug.js  | 2 +-
 roojs-bootstrap.js        | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Roo/bootstrap/Markdown.js b/Roo/bootstrap/Markdown.js
index 86d1900cbb..bf07dd7f6a 100644
--- a/Roo/bootstrap/Markdown.js
+++ b/Roo/bootstrap/Markdown.js
@@ -65,11 +65,8 @@ Roo.extend(Roo.bootstrap.Markdown, Roo.bootstrap.TextArea,  {
             this.markdownEl.dom.innerHTML = String.format('<span class="roo-placeholder">{0}</span>', this.placeholder || '');
             return;
         }
-         var v = this.getValue();
-        if (v === false) {
-            v = '';
-        }
-        this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v));
+ 
+        this.markdownEl.dom.innerHTML = Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(this.getValue()));
     },
     
     resizeTextArea: function () {
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 3b11f1fa05..48c3b0b07e 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -26174,7 +26174,7 @@ Roo.extend(Roo.bootstrap.Markdown, Roo.bootstrap.TextArea,  {
     updateMarkdown : function()
     {
         if (this.getValue() == '') {
-            this.markdownEl.dom.innerHTML = String.format('<span class="roo-placeholder">{0}</span>', this.placeholder);
+            this.markdownEl.dom.innerHTML = String.format('<span class="roo-placeholder">{0}</span>', this.placeholder || '');
             return;
         }
          var v = this.getValue();
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index f8acffbd27..3b9941fc75 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1097,7 +1097,7 @@ this.editor.toggleSourceEdit(A);}});
 Roo.bootstrap.Markdown=function(A){Roo.bootstrap.Markdown.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.Markdown,Roo.bootstrap.TextArea,{editing:false,initEvents:function(){Roo.bootstrap.TextArea.prototype.initEvents.call(this);this.markdownEl=this.el.createChild({cls:'roo-markdown-area'}
 );this.inputEl().addClass('d-none');var v=this.getValue();if(v===false){v='';}this.markdownEl.dom.innerHTML=Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v));this.markdownEl.on('click',this.toggleTextEdit,this);this.on('blur',this.toggleTextEdit,this);this.on('specialkey',this.resizeTextArea,this);
 },toggleTextEdit:function(){var sh=this.markdownEl.getHeight();this.inputEl().addClass('d-none');this.markdownEl.addClass('d-none');if(!this.editing){this.inputEl().setHeight(Math.min(500,Math.max(sh,(this.getValue().split("\n").length+1)*30)));this.inputEl().removeClass('d-none');
-this.inputEl().focus();this.editing=true;return;}this.updateMarkdown();this.markdownEl.removeClass('d-none');this.editing=false;return;},updateMarkdown:function(){if(this.getValue()==''){this.markdownEl.dom.innerHTML=String.format('<span class="roo-placeholder">{0}</span>',this.placeholder);
+this.inputEl().focus();this.editing=true;return;}this.updateMarkdown();this.markdownEl.removeClass('d-none');this.editing=false;return;},updateMarkdown:function(){if(this.getValue()==''){this.markdownEl.dom.innerHTML=String.format('<span class="roo-placeholder">{0}</span>',this.placeholder||'');
 return;}var v=this.getValue();if(v===false){v='';}this.markdownEl.dom.innerHTML=Roo.Markdown.toHtml(Roo.util.Format.htmlEncode(v));},resizeTextArea:function(){var sh=100;Roo.log([sh,this.getValue().split("\n").length*30]);this.inputEl().setHeight(Math.min(500,Math.max(sh,(this.getValue().split("\n").length+1)*30)));
 },setValue:function(A){Roo.bootstrap.TextArea.prototype.setValue.call(this,A);if(!this.editing){this.updateMarkdown();}},focus:function(){if(!this.editing){this.toggleTextEdit();}}});
 // Roo/bootstrap/Table/AbstractSelectionModel.js
-- 
2.39.2