From e80f063371c67cb4b27fce09d5ab3a3dd7ca7596 Mon Sep 17 00:00:00 2001
From: yangjian <zmister@qq.com>
Date: Sun, 7 Mar 2021 10:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96iframe=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=92=8C=E8=A7=A3=E5=86=B3=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=8E=B7=E5=8F=96=E6=96=87=E9=9B=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8403=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/editor.md/editormd.js                     | 14 +++++++++-----
 template/app_doc/docs_base.html                  |  4 ++--
 template/app_doc/editor/create_base.html         |  2 +-
 template/app_doc/editor/tpl_editor_editormd.html |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/static/editor.md/editormd.js b/static/editor.md/editormd.js
index ed28b52..9014ee7 100644
--- a/static/editor.md/editormd.js
+++ b/static/editor.md/editormd.js
@@ -3628,14 +3628,18 @@
                         } else if (tedMatch && tedMatch[1]) {
                             return `<iframe height=400 width=500 frameborder=0 allowfullscreen src="//embed.ted.com/talks/${tedMatch[1]}">`
                         }else{
-                            for(var i = 0; i< iframe_whitelist.length; i++){
-                                if(href.match(iframe_whitelist[i])){
-                                    return '<iframe height=400 width=500 src="' + href +'" frameborder=0 allowfullscreen />'
+                            if(iframe_whitelist.length == 1 && iframe_whitelist[0] == ""){
+                                return href
+                            }else{
+                                for(var i = 0; i< iframe_whitelist.length; i++){
+                                    if(href.match(iframe_whitelist[i])){
+                                        return '<iframe height=400 width=500 src="' + href +'" frameborder=0 allowfullscreen />'
+                                    }
                                 }
                             }
+
                         }
                         break;
-                        // return '<iframe height=400 width=500 src="' + href +'" frameborder=0 allowfullscreen />'
                 }
             }
 
@@ -4246,7 +4250,7 @@
      */
     
     editormd.filterHTMLTags = function(html, filters) {
-        
+
         if (typeof html !== "string") {
             html = new String(html).toString();
         }
diff --git a/template/app_doc/docs_base.html b/template/app_doc/docs_base.html
index 46388e5..7f91454 100644
--- a/template/app_doc/docs_base.html
+++ b/template/app_doc/docs_base.html
@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-Control" content="no-transform" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <meta http-equiv="Cache-Control" content="max-age=7200" />
-    <meta name="referrer" content="no-referrer">
+    <!-- <meta name="referrer" content="no-referrer"> -->
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="keywords" content="{% block keyword %}{% endblock %}{{site_keywords}}"/>
     <meta name="description" content="{% block description %}{% endblock %}" />
@@ -339,7 +339,7 @@
             tocContainer : "#toc-container",
             tocDropdown   : false,
             atLink    : false,//禁用@链接
-            htmlDecode     : "link,style,base,script,iframe", //过滤部分HTML标签
+            htmlDecode     : "link,style,base,script", //过滤部分HTML标签
         });
     
     {% elif doc.editor_mode == 2 %}
diff --git a/template/app_doc/editor/create_base.html b/template/app_doc/editor/create_base.html
index 79d3404..28049eb 100644
--- a/template/app_doc/editor/create_base.html
+++ b/template/app_doc/editor/create_base.html
@@ -8,7 +8,7 @@
         <meta http-equiv="Cache-Control" content="no-transform" />
         <meta http-equiv="Cache-Control" content="no-siteapp" />
         <meta http-equiv="Cache-Control" content="max-age=7200" />
-        <meta name="referrer" content="no-referrer">
+        <!-- <meta name="referrer" content="no-referrer"> -->
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
         <title>{% block title %}{% endblock %} - {% if site_name != None and site_name != '' %}{{site_name}} {% else %}站点标题{% endif %}</title>
         <link href="{% static 'layui/css/layui.css' %}?version={{mrdoc_version}}" rel="stylesheet">
diff --git a/template/app_doc/editor/tpl_editor_editormd.html b/template/app_doc/editor/tpl_editor_editormd.html
index 1bf42ed..7f20922 100644
--- a/template/app_doc/editor/tpl_editor_editormd.html
+++ b/template/app_doc/editor/tpl_editor_editormd.html
@@ -219,7 +219,7 @@
         sequenceDiagram : true, //开启序列图
         imageUpload    : true, //开启图片上传
         codeFold       :true, //代码折叠
-        htmlDecode     : "link,style,base,script,iframe", //过滤部分HTML标签
+        htmlDecode     : "link,style,base,script", //过滤部分HTML标签
         imageFormats   : ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
         imageUploadURL : "{% url 'upload_doc_img' %}",
         onchange:function(){