From 95dfecdc0852f962ab766784160bbaad594c03c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E6=99=93=E9=97=AF?= Date: Tue, 6 Nov 2018 22:28:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E4=BF=AE=E5=A4=8DUE?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dialogs/map/map.html | 4 ++-- dialogs/map/map.js | 7 ++++--- umeditor.config.js | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dialogs/map/map.html b/dialogs/map/map.html index be97a8c1..18be07b0 100644 --- a/dialogs/map/map.html +++ b/dialogs/map/map.html @@ -14,7 +14,7 @@ overflow: hidden; } - + @@ -103,7 +103,7 @@ function mapListenerHandler() { var zoom = map.getZoom(), center = map.getCenter(), - marker = window.marker.P; + marker = window.marker.point; iframe.src = iframe.src. replace(new RegExp('([?#&])center=([^?#&]+)', 'i'), '$1center=' + center.lng + ',' + center.lat). diff --git a/dialogs/map/map.js b/dialogs/map/map.js index 6f898c4a..711b5072 100755 --- a/dialogs/map/map.js +++ b/dialogs/map/map.js @@ -50,7 +50,7 @@ " document.close(); " + " } }" + "" + - "" + + "" + "" + "" + "", @@ -184,7 +184,8 @@ me.map.centerAndZoom(points[0], 13); } point = me.map.getCenter(); - me.marker.setPoint(point); + me.marker = new BMap.Marker(point); + me.map.addOverlay(me.marker); } else { alert(me.lang.errorMsg); } @@ -231,7 +232,7 @@ center = widget.map.getCenter(), zoom = widget.map.getZoom(), size = widget.map.getSize(), - point = widget.marker.P; + point = widget.marker.point; if (widget.root().find(".edui-map-dynamic")[0].checked) { var URL = editor.getOpt('UMEDITOR_HOME_URL'), diff --git a/umeditor.config.js b/umeditor.config.js index 7564cedf..e0424b66 100755 --- a/umeditor.config.js +++ b/umeditor.config.js @@ -295,7 +295,7 @@ etpl.config({ header: ['style', 'class', 'id'], hr: ['style', 'class', 'id'], i: ['style', 'class', 'id'], -// iframe: ['style', 'class', 'id', 'src', 'frameborder', 'data-latex'], + iframe: ['style', 'class', 'id', 'src', 'frameborder', 'data-latex','width','height'], img: ['src', 'alt', 'title', 'width', 'height', 'style', 'class', 'id', '_url'], ins: ['datetime', 'style', 'class', 'id'], li: ['style', 'class', 'id'],