diff options
author | Abyss777 <abyss@fox5.ru> | 2017-08-18 11:52:06 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-08-18 11:52:06 +0500 |
commit | 65116928b2b7a8e5e2b70bf490b3225896cf2c71 (patch) | |
tree | af24b231822fb045a7ae4d03e533775285d41e47 /web/app/controller/Root.js | |
parent | 01af5f520e24a33d7e22523d8ed11e9f14a19516 (diff) | |
parent | b3d3c720f34e12e7af83e6be3bd87e304931bbe1 (diff) | |
download | trackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.gz trackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.bz2 trackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.zip |
Merge branch 'master' into disable_vehicle_features
Diffstat (limited to 'web/app/controller/Root.js')
-rw-r--r-- | web/app/controller/Root.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index baba68a1..92620115 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -52,6 +52,7 @@ Ext.define('Traccar.controller.Root', { if (value !== undefined) { return Traccar.AttributeFormatter.getAttributeConverter(this.attributeKey)(value); } + return null; }, onLaunch: function () { @@ -162,7 +163,7 @@ Ext.define('Traccar.controller.Root', { pathname = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/') + 1); socket = new WebSocket(protocol + '//' + window.location.host + pathname + 'api/socket'); - socket.onclose = function (event) { + socket.onclose = function () { Traccar.app.showToast(Strings.errorSocket, Strings.errorTitle); Ext.Ajax.request({ @@ -291,7 +292,10 @@ Ext.define('Traccar.controller.Root', { if (success) { for (i = 0; i < records.length; i++) { value = records[i].get('type'); - store.add({type: value, name: Traccar.app.getEventString(value)}); + store.add({ + type: value, + name: Traccar.app.getEventString(value) + }); } } } |