aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-07-24 08:53:00 +0300
committerninioe <ninioe@gmail.com>2016-07-24 08:53:00 +0300
commit729f34a34c4b3f857823293c8a46661f606cb03b (patch)
tree7e61f511fe092fd2a404c602f4ca921ea1393c9b /web/app
parent2e7987b5df7611299aa76bcc9eca3424ce31d204 (diff)
downloadtrackermap-server-729f34a34c4b3f857823293c8a46661f606cb03b.tar.gz
trackermap-server-729f34a34c4b3f857823293c8a46661f606cb03b.tar.bz2
trackermap-server-729f34a34c4b3f857823293c8a46661f606cb03b.zip
more fixes
Diffstat (limited to 'web/app')
-rw-r--r--web/app/controller/Root.js20
-rw-r--r--web/app/view/Devices.js4
2 files changed, 12 insertions, 12 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index fd30fe7c9..367b98d88 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -90,14 +90,14 @@ Ext.define('Traccar.controller.Root', {
},
beep: function () {
- if (this.snd === null) {
- this.snd = new Audio('beep.wav');
+ if (this.beepSound === null) {
+ this.beepSound = new Audio('beep.wav');
}
- this.snd.play();
+ this.beepSound.play();
},
- showAlarmSelected: function () {
- return Ext.getCmp('showAlarmButton') && Ext.getCmp('showAlarmButton').pressed;
+ showNotificationsSelected: function () {
+ return Ext.getCmp('showNotificationsButton') && Ext.getCmp('showNotificationsButton').pressed;
},
asyncUpdate: function (first) {
@@ -159,7 +159,7 @@ Ext.define('Traccar.controller.Root', {
} else if (array[i].type === 'alarm' && data.positions) {
alarmKey = 'alarm';
text = Strings[alarmKey];
- if (typeof text === 'undefined') {
+ if (!text) {
text = alarmKey;
}
for (j = 0; j < data.positions.length; j++) {
@@ -167,7 +167,7 @@ Ext.define('Traccar.controller.Root', {
if (typeof data.positions[j].attributes.alarm === 'string' && data.positions[j].attributes.alarm.length >= 2) {
alarmKey = 'alarm' + data.positions[j].attributes.alarm.charAt(0).toUpperCase() + data.positions[j].attributes.alarm.slice(1);
text = Strings[alarmKey];
- if (typeof text === 'undefined') {
+ if (!text) {
text = alarmKey;
}
}
@@ -177,7 +177,7 @@ Ext.define('Traccar.controller.Root', {
} else {
typeKey = 'event' + array[i].type.charAt(0).toUpperCase() + array[i].type.slice(1);
text = Strings[typeKey];
- if (typeof text === 'undefined') {
+ if (!text) {
text = typeKey;
}
}
@@ -189,9 +189,9 @@ Ext.define('Traccar.controller.Root', {
}
device = Ext.getStore('Devices').getById(array[i].deviceId);
if (typeof device !== 'undefined') {
- if (self.showAlarmSelected()) {
+ if (self.showNotificationsSelected()) {
self.beep();
- Ext.toast(text, device.getData().name);
+ Ext.toast(text, device.get('name'));
}
}
}
diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 31d22ed2a..212aa7f96 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -58,9 +58,9 @@ Ext.define('Traccar.view.Devices', {
}, {
xtype: 'tbfill'
},{
- id: 'showAlarmButton',
+ id: 'showNotificationsButton',
glyph: 'xf0a2@FontAwesome',
- tooltip: 'Show Alarms',
+ tooltip: Strings.showNotifications,
tooltipType: 'title',
pressed : true,
enableToggle: true,