aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-08-03 11:54:24 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-08-03 11:54:24 +1200
commitd5d7a82207f27fa5e544e1cf050dcc02fc1df12f (patch)
tree8f6bf5aeeae8d56f7295d0c1a8a1f15c7d746148 /web/app
parent8e41bea48b0b248bcb198186783778002a92738e (diff)
downloadtraccar-server-d5d7a82207f27fa5e544e1cf050dcc02fc1df12f.tar.gz
traccar-server-d5d7a82207f27fa5e544e1cf050dcc02fc1df12f.tar.bz2
traccar-server-d5d7a82207f27fa5e544e1cf050dcc02fc1df12f.zip
Change aliases and xtype names
Diffstat (limited to 'web/app')
-rw-r--r--web/app/view/admin/ServerDialog.js3
-rw-r--r--web/app/view/admin/ServerDialogController.js2
-rw-r--r--web/app/view/command/CommandDialog.js3
-rw-r--r--web/app/view/command/CommandDialogController.js2
-rw-r--r--web/app/view/device/Device.js4
-rw-r--r--web/app/view/device/DeviceController.js2
-rw-r--r--web/app/view/device/DeviceDialog.js3
-rw-r--r--web/app/view/device/DeviceDialogController.js2
-rw-r--r--web/app/view/main/Main.js8
-rw-r--r--web/app/view/map/Map.js6
-rw-r--r--web/app/view/report/Report.js2
-rw-r--r--web/app/view/state/State.js2
-rw-r--r--web/app/view/user/User.js4
-rw-r--r--web/app/view/user/UserDialog.js3
-rw-r--r--web/app/view/user/UserDialogController.js2
15 files changed, 22 insertions, 26 deletions
diff --git a/web/app/view/admin/ServerDialog.js b/web/app/view/admin/ServerDialog.js
index 0e2dad995..37bb498a0 100644
--- a/web/app/view/admin/ServerDialog.js
+++ b/web/app/view/admin/ServerDialog.js
@@ -16,13 +16,12 @@
Ext.define('Traccar.view.admin.ServerDialog', {
extend: 'Ext.window.Window',
- xtype: 'server-dialog',
requires: [
'Traccar.view.admin.ServerDialogController'
],
- controller: 'serverdialog',
+ controller: 'serverDialog',
bodyPadding: styles.panelPadding,
title: strings.serverTitle,
diff --git a/web/app/view/admin/ServerDialogController.js b/web/app/view/admin/ServerDialogController.js
index bbb98d3a0..ed1ec20f8 100644
--- a/web/app/view/admin/ServerDialogController.js
+++ b/web/app/view/admin/ServerDialogController.js
@@ -16,7 +16,7 @@
Ext.define('Traccar.view.admin.ServerDialogController', {
extend: 'Ext.app.ViewController',
- alias: 'controller.serverdialog',
+ alias: 'controller.serverDialog',
onSaveClick: function(button) {
var dialog = button.up('window').down('form');
diff --git a/web/app/view/command/CommandDialog.js b/web/app/view/command/CommandDialog.js
index 8a4be93cb..dbde458e3 100644
--- a/web/app/view/command/CommandDialog.js
+++ b/web/app/view/command/CommandDialog.js
@@ -16,13 +16,12 @@
Ext.define('Traccar.view.command.CommandDialog', {
extend: 'Ext.window.Window',
- xtype: 'command-dialog',
requires: [
'Traccar.view.command.CommandDialogController'
],
- controller: 'commanddialog',
+ controller: 'commandDialog',
bodyPadding: styles.panelPadding,
title: strings.commandTitle,
diff --git a/web/app/view/command/CommandDialogController.js b/web/app/view/command/CommandDialogController.js
index 84004e2aa..84ab8ede5 100644
--- a/web/app/view/command/CommandDialogController.js
+++ b/web/app/view/command/CommandDialogController.js
@@ -16,7 +16,7 @@
Ext.define('Traccar.view.command.CommandDialogController', {
extend: 'Ext.app.ViewController',
- alias: 'controller.commanddialog',
+ alias: 'controller.commandDialog',
onSelect: function(selected) {
this.lookupReference('paramPositionPeriodic').setHidden(
diff --git a/web/app/view/device/Device.js b/web/app/view/device/Device.js
index 1435dcaf1..98b94b97b 100644
--- a/web/app/view/device/Device.js
+++ b/web/app/view/device/Device.js
@@ -16,8 +16,8 @@
Ext.define('Traccar.view.device.Device', {
extend: 'Ext.grid.Panel',
- xtype: 'device-view',
-
+ xtype: 'deviceView',
+
requires: [
'Traccar.view.device.DeviceController'
],
diff --git a/web/app/view/device/DeviceController.js b/web/app/view/device/DeviceController.js
index e9cda9bbe..5a0ea85df 100644
--- a/web/app/view/device/DeviceController.js
+++ b/web/app/view/device/DeviceController.js
@@ -122,7 +122,7 @@ Ext.define('Traccar.view.device.DeviceController', {
layout: 'fit',
modal: true,
items: {
- xtype: 'user-view'
+ xtype: 'userView'
}
}).show();
},
diff --git a/web/app/view/device/DeviceDialog.js b/web/app/view/device/DeviceDialog.js
index 84a975c6a..5c5042587 100644
--- a/web/app/view/device/DeviceDialog.js
+++ b/web/app/view/device/DeviceDialog.js
@@ -16,13 +16,12 @@
Ext.define('Traccar.view.device.DeviceDialog', {
extend: 'Ext.window.Window',
- xtype: 'device-dialog',
requires: [
'Traccar.view.device.DeviceDialogController'
],
- controller: 'devicedialog',
+ controller: 'deviceDialog',
bodyPadding: styles.panelPadding,
title: strings.deviceDialog,
diff --git a/web/app/view/device/DeviceDialogController.js b/web/app/view/device/DeviceDialogController.js
index 75f0a14ca..0fcb1efb3 100644
--- a/web/app/view/device/DeviceDialogController.js
+++ b/web/app/view/device/DeviceDialogController.js
@@ -16,7 +16,7 @@
Ext.define('Traccar.view.device.DeviceDialogController', {
extend: 'Ext.app.ViewController',
- alias: 'controller.devicedialog',
+ alias: 'controller.deviceDialog',
onSaveClick: function(button) {
var dialog = button.up('window').down('form');
diff --git a/web/app/view/main/Main.js b/web/app/view/main/Main.js
index 75414cd41..cb09abad2 100644
--- a/web/app/view/main/Main.js
+++ b/web/app/view/main/Main.js
@@ -42,21 +42,21 @@ Ext.define('Traccar.view.main.Main', {
items: [{
collapsible: false,
region: 'center',
- xtype: 'device-view',
+ xtype: 'deviceView',
flex: 1
}, {
region: 'south',
- xtype: 'state-view',
+ xtype: 'stateView',
flex: 1
}]
}, {
region: 'south',
- xtype: 'report-view',
+ xtype: 'reportView',
header: false,
height: styles.reportHeight
}, {
region: 'center',
- xtype: 'map-view',
+ xtype: 'mapView',
collapsible: false
}]
diff --git a/web/app/view/map/Map.js b/web/app/view/map/Map.js
index 5702ff7b5..6b323e555 100644
--- a/web/app/view/map/Map.js
+++ b/web/app/view/map/Map.js
@@ -16,7 +16,7 @@
Ext.define('Traccar.view.map.Map', {
extend: 'Ext.form.Panel',
- xtype: 'map-view',
+ xtype: 'mapView',
requires: [
'Traccar.view.map.MapController'
@@ -39,12 +39,12 @@ Ext.define('Traccar.view.map.Map', {
var bindKey = 'AseEs0DLJhLlTNoxbNXu7DGsnnH4UoWuGue7-irwKkE3fffaClwc9q_Mr6AyHY8F';
if (mapLayer === 'bingRoad') {
- var layer = new ol.layer.Tile({ source: new ol.source.BingMaps({
+ layer = new ol.layer.Tile({ source: new ol.source.BingMaps({
key: bindKey,
imagerySet: 'Road'
})});
} else if (mapLayer === 'bingAerial') {
- var layer = new ol.layer.Tile({ source: new ol.source.BingMaps({
+ layer = new ol.layer.Tile({ source: new ol.source.BingMaps({
key: bindKey,
imagerySet: 'Aerial'
})});
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index 562f13c09..ff8cc7b3d 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -16,7 +16,7 @@
Ext.define('Traccar.view.report.Report', {
extend: 'Ext.grid.Panel',
- xtype: 'report-view',
+ xtype: 'reportView',
requires: [
'Traccar.view.report.ReportController'
diff --git a/web/app/view/state/State.js b/web/app/view/state/State.js
index 39460dc52..681758cb8 100644
--- a/web/app/view/state/State.js
+++ b/web/app/view/state/State.js
@@ -16,7 +16,7 @@
Ext.define('Traccar.view.state.State', {
extend: 'Ext.grid.Panel',
- xtype: 'state-view',
+ xtype: 'stateView',
requires: [
'Traccar.view.state.StateController'
diff --git a/web/app/view/user/User.js b/web/app/view/user/User.js
index a355bbe2f..69498310f 100644
--- a/web/app/view/user/User.js
+++ b/web/app/view/user/User.js
@@ -16,8 +16,8 @@
Ext.define('Traccar.view.user.User', {
extend: 'Ext.grid.Panel',
- xtype: 'user-view',
-
+ xtype: 'userView',
+
requires: [
'Traccar.view.user.UserController'
],
diff --git a/web/app/view/user/UserDialog.js b/web/app/view/user/UserDialog.js
index 5d92cf04b..d1bc68f96 100644
--- a/web/app/view/user/UserDialog.js
+++ b/web/app/view/user/UserDialog.js
@@ -16,13 +16,12 @@
Ext.define('Traccar.view.user.UserDialog', {
extend: 'Ext.window.Window',
- xtype: 'user-dialog',
requires: [
'Traccar.view.user.UserDialogController'
],
- controller: 'userdialog',
+ controller: 'userDialog',
bodyPadding: styles.panelPadding,
title: strings.settingsUser,
diff --git a/web/app/view/user/UserDialogController.js b/web/app/view/user/UserDialogController.js
index c5464225c..cd37f70cf 100644
--- a/web/app/view/user/UserDialogController.js
+++ b/web/app/view/user/UserDialogController.js
@@ -16,7 +16,7 @@
Ext.define('Traccar.view.user.UserDialogController', {
extend: 'Ext.app.ViewController',
- alias: 'controller.userdialog',
+ alias: 'controller.userDialog',
init: function() {
if (Traccar.getApplication().getUser().get('admin')) {