aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-08 11:49:00 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-08 11:49:00 +0500
commit8b5bbc7a899205a40e1d246862f54ecb4b939682 (patch)
tree071387887d5900cfcdcbbfbcc7fda4f4b0f35c1d
parent97fd53f33b92e334e6094edb340ea551a44d136e (diff)
downloadetbsa-traccar-web-8b5bbc7a899205a40e1d246862f54ecb4b939682.tar.gz
etbsa-traccar-web-8b5bbc7a899205a40e1d246862f54ecb4b939682.tar.bz2
etbsa-traccar-web-8b5bbc7a899205a40e1d246862f54ecb4b939682.zip
Load SVGs to html
-rw-r--r--web/app/store/DeviceImages.js18
-rw-r--r--web/load.js16
2 files changed, 20 insertions, 14 deletions
diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js
index 57745f1..4e49482 100644
--- a/web/app/store/DeviceImages.js
+++ b/web/app/store/DeviceImages.js
@@ -22,28 +22,28 @@ Ext.define('Traccar.store.DeviceImages', {
data: [{
key: 'default',
name: Strings.categoryDefault,
- url: 'images/arrow.svg',
+ elementId: 'arrowSvg',
rotateId: 'arrow',
fillId: 'arrow',
scale: 1
}, {
key: 'car',
name: Strings.categoryCar,
- url: 'images/car.svg',
+ elementId: 'carSvg',
fillId: 'path4149',
rotateId: 'g4207',
scale: 0.06,
}, {
key: 'bus',
name: Strings.categoryBus,
- url: 'images/bus.svg',
+ elementId: 'busSvg',
fillId: 'path4713',
rotateId: 'layer2',
scale: 0.12,
}, {
key: 'truck',
name: Strings.categoryTruck,
- url: 'images/truck.svg',
+ elementId: 'truckSvg',
fillId: 'path4718',
rotateId: 'layer2',
scale: 0.1,
@@ -52,15 +52,7 @@ Ext.define('Traccar.store.DeviceImages', {
constructor: function() {
this.callParent(arguments);
this.config.data.forEach(function (device) {
- if (device.url) {
- Ext.Ajax.request({
- url: device.url,
- scope: device,
- success: function (response) {
- this.svg = new DOMParser().parseFromString(response.responseText, "image/svg+xml");
- }
- });
- }
+ device.svg = document.getElementById(device.elementId).contentDocument;
});
}
}); \ No newline at end of file
diff --git a/web/load.js b/web/load.js
index f4987ac..7f0caf9 100644
--- a/web/load.js
+++ b/web/load.js
@@ -14,6 +14,15 @@
script.async = false
document.head.appendChild(script);
}
+
+ function addSvgFile(file, id) {
+ var svg = document.createElement('object');
+ svg.setAttribute('id', id);
+ svg.setAttribute('data', file);
+ svg.setAttribute('type', 'image/svg+xml');
+ svg.setAttribute('style','visibility:hidden')
+ document.body.appendChild(svg);
+ }
var debugMode = document.getElementById('loadScript').getAttribute('mode') === 'debug';
var touchMode = 'ontouchstart' in window || navigator.maxTouchPoints;
@@ -119,6 +128,11 @@
addScriptFile('//cdnjs.cloudflare.com/ajax/libs/ol3/' + olVersion + '/ol-debug.js');
addStyleFile('app.css');
- addScriptFile('arrow.js');
+ //addScriptFile('arrow.js');
+
+ addSvgFile('images/arrow.svg', 'arrowSvg');
+ addSvgFile('images/car.svg', 'carSvg');
+ addSvgFile('images/bus.svg', 'busSvg');
+ addSvgFile('images/truck.svg', 'truckSvg');
})();