aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-11-17 15:36:34 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2018-11-17 15:36:34 +1300
commit58e1f370c568af64a1dcbd9af1d5541b0e9314ed (patch)
tree73f80cf7c33d19b996e8a4e91d47098e8e1976f6
parent62db06b85439b21a7851016f3e9c17f0abfe7185 (diff)
downloadetbsa-traccar-web-58e1f370c568af64a1dcbd9af1d5541b0e9314ed.tar.gz
etbsa-traccar-web-58e1f370c568af64a1dcbd9af1d5541b0e9314ed.tar.bz2
etbsa-traccar-web-58e1f370c568af64a1dcbd9af1d5541b0e9314ed.zip
Unescape HTML in some cases
-rw-r--r--web/app/view/dialog/ComputedAttribute.js7
-rw-r--r--web/app/view/dialog/Server.js7
-rw-r--r--web/app/view/map/BaseMap.js3
3 files changed, 15 insertions, 2 deletions
diff --git a/web/app/view/dialog/ComputedAttribute.js b/web/app/view/dialog/ComputedAttribute.js
index ef6269b..22cfb82 100644
--- a/web/app/view/dialog/ComputedAttribute.js
+++ b/web/app/view/dialog/ComputedAttribute.js
@@ -28,6 +28,12 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
items: {
xtype: 'form',
+ listeners: {
+ afterrender: function (view) {
+ var field = view.up('panel').lookupReference('expressionField');
+ field.setValue(Ext.String.htmlDecode(field.getValue()));
+ }
+ },
items: [{
xtype: 'textfield',
name: 'description',
@@ -44,6 +50,7 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
}
}, {
xtype: 'textareafield',
+ reference: 'expressionField',
name: 'expression',
fieldLabel: Strings.sharedExpression,
allowBlank: false
diff --git a/web/app/view/dialog/Server.js b/web/app/view/dialog/Server.js
index fbfb3c6..8ff8399 100644
--- a/web/app/view/dialog/Server.js
+++ b/web/app/view/dialog/Server.js
@@ -28,6 +28,12 @@ Ext.define('Traccar.view.dialog.Server', {
items: {
xtype: 'form',
+ listeners: {
+ afterrender: function (view) {
+ var field = view.up('panel').lookupReference('mapUrlField');
+ field.setValue(Ext.String.htmlDecode(field.getValue()));
+ }
+ },
items: [{
xtype: 'fieldset',
title: Strings.sharedPreferences,
@@ -44,6 +50,7 @@ Ext.define('Traccar.view.dialog.Server', {
fieldLabel: Strings.mapBingKey
}, {
xtype: 'textfield',
+ reference: 'mapUrlField',
name: 'mapUrl',
fieldLabel: Strings.mapCustom
}, {
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index 26b9f7c..67e08f6 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -41,8 +41,7 @@ Ext.define('Traccar.view.map.BaseMap', {
case 'custom':
layer = new ol.layer.Tile({
source: new ol.source.XYZ({
- url: new DOMParser()
- .parseFromString(server.get('mapUrl'), 'text/html').documentElement.textContent,
+ url: Ext.String.htmlDecode(server.get('mapUrl')),
attributions: ''
})
});