diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-04-25 18:34:38 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-04-25 18:34:38 -0700 |
commit | eb4c3b7910312d0f75ee358cd5607dd68e5400cf (patch) | |
tree | 6b24de1d1541920bb4ca71fcb877376c17311389 /web/app/view/map/MapMarkerController.js | |
parent | 17c237aa7bfc1956ef231f42bfb31d911eb8ad3a (diff) | |
download | trackermap-web-eb4c3b7910312d0f75ee358cd5607dd68e5400cf.tar.gz trackermap-web-eb4c3b7910312d0f75ee358cd5607dd68e5400cf.tar.bz2 trackermap-web-eb4c3b7910312d0f75ee358cd5607dd68e5400cf.zip |
Fix map labels encoding (fix #737)
Diffstat (limited to 'web/app/view/map/MapMarkerController.js')
-rw-r--r-- | web/app/view/map/MapMarkerController.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js index 295d2f50..630497a2 100644 --- a/web/app/view/map/MapMarkerController.js +++ b/web/app/view/map/MapMarkerController.js @@ -130,7 +130,7 @@ Ext.define('Traccar.view.map.MapMarkerController', { }, updateDevice: function (store, data) { - var i, device, deviceId, marker, style; + var i, device, deviceId, deviceName, marker, style; if (!Ext.isArray(data)) { data = [data]; @@ -148,8 +148,9 @@ Ext.define('Traccar.view.map.MapMarkerController', { this.updateDeviceMarker(style, this.getDeviceColor(device), device.get('category')); marker.changed(); } - if (style.getText().getText() !== device.get('name')) { - style.getText().setText(device.get('name')); + deviceName = Ext.String.htmlDecode(device.get('name')); + if (style.getText().getText() !== deviceName) { + style.getText().setText(deviceName); marker.changed(); } } @@ -260,7 +261,7 @@ Ext.define('Traccar.view.map.MapMarkerController', { style = this.getLatestMarker(this.getDeviceColor(device), position.get('course'), device.get('category')); - style.getText().setText(device.get('name')); + style.getText().setText(Ext.String.htmlDecode(device.get('name'))); marker.setStyle(style); marker.setId(device.get('id')); this.latestMarkers[deviceId] = marker; |