aboutsummaryrefslogtreecommitdiff
path: root/web/app/controller/Root.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-08-09 23:42:31 +1200
committerGitHub <noreply@github.com>2017-08-09 23:42:31 +1200
commit1873fc05dfa0532d1ca665bd3d32ce5cb1d8d040 (patch)
tree528d74d36e68e964a6238bc5aec9ab56e3620af7 /web/app/controller/Root.js
parentc7888fcf5e92280ed4573ee0973872a59451ac52 (diff)
parent959797ec42f8ac770531c73101aa716c1a7b08fa (diff)
downloadtrackermap-web-1873fc05dfa0532d1ca665bd3d32ce5cb1d8d040.tar.gz
trackermap-web-1873fc05dfa0532d1ca665bd3d32ce5cb1d8d040.tar.bz2
trackermap-web-1873fc05dfa0532d1ca665bd3d32ce5cb1d8d040.zip
Merge pull request #543 from Abyss777/select_device_from_url
Select device from deviceId url parameter
Diffstat (limited to 'web/app/controller/Root.js')
-rw-r--r--web/app/controller/Root.js14
1 files changed, 12 insertions, 2 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index d85102a7..baba68a1 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -17,6 +17,7 @@
Ext.define('Traccar.controller.Root', {
extend: 'Ext.app.Controller',
+ alias: 'controller.root',
requires: [
'Traccar.view.dialog.Login',
@@ -225,7 +226,7 @@ Ext.define('Traccar.controller.Root', {
},
updatePositions: function (array, first) {
- var i, store, entity;
+ var i, store, entity, deviceId, device;
store = Ext.getStore('LatestPositions');
for (i = 0; i < array.length; i++) {
entity = store.findRecord('deviceId', array[i].deviceId, 0, false, false, true);
@@ -239,7 +240,16 @@ Ext.define('Traccar.controller.Root', {
}
}
if (first) {
- this.zoomToAllDevices();
+ deviceId = Ext.Object.fromQueryString(window.location.search).deviceId;
+ if (deviceId) {
+ device = Ext.getStore('VisibleDevices').findRecord('id', deviceId, 0, false, true, true);
+ if (device) {
+ this.fireEvent('selectdevice', device, true);
+ }
+ }
+ if (!device) {
+ this.zoomToAllDevices();
+ }
}
},