Skip to content

修复: 修复UE地图组件bug #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fengxiaochuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复: 修复UE地图组件bug #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dialogs/map/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
overflow: hidden;
}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=2.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=3.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true"></script>
</head>

<body onload="initMap();">
Expand Down Expand Up @@ -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).
Expand Down
7 changes: 4 additions & 3 deletions dialogs/map/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
" document.close(); " +
" } }" +
"</scr_ipt>" +
"<scr_ipt onreadystatechange='mapReadyStateChange(this.readyState);' onload='mapReadyStateChange(\"loaded\");' src=\"http://api.map.baidu.com/api?v=2.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true\"></scr_ipt>" +
"<scr_ipt onreadystatechange='mapReadyStateChange(this.readyState);' onload='mapReadyStateChange(\"loaded\");' src=\"http://api.map.baidu.com/api?v=3.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true\"></scr_ipt>" +
"</body>" +
"</html>" +
"</script>",
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion umeditor.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down