aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-01-10 13:31:30 +0500
committerAbyss777 <abyss@fox5.ru>2017-01-10 13:31:30 +0500
commitda4fabbd8e854379e4bc4ffb0967feee2d77cfd1 (patch)
tree84aaf22f7634a1ed62b6608b2ad7c67cac833116 /web
parent80a1febd87a4c57ef9d0874cfb7ec06d5603e6af (diff)
downloadetbsa-traccar-web-da4fabbd8e854379e4bc4ffb0967feee2d77cfd1.tar.gz
etbsa-traccar-web-da4fabbd8e854379e4bc4ffb0967feee2d77cfd1.tar.bz2
etbsa-traccar-web-da4fabbd8e854379e4bc4ffb0967feee2d77cfd1.zip
Rename calendarData to data
Diffstat (limited to 'web')
-rw-r--r--web/app/model/Calendar.js2
-rw-r--r--web/app/view/CalendarDialog.js4
-rw-r--r--web/app/view/CalendarDialogController.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/web/app/model/Calendar.js b/web/app/model/Calendar.js
index 00b076b..8c44d62 100644
--- a/web/app/model/Calendar.js
+++ b/web/app/model/Calendar.js
@@ -27,7 +27,7 @@ Ext.define('Traccar.model.Calendar', {
name: 'name',
type: 'string'
}, {
- name: 'calendarData'
+ name: 'data'
}, {
name: 'attributes'
}]
diff --git a/web/app/view/CalendarDialog.js b/web/app/view/CalendarDialog.js
index 2609a6d..795c2c6 100644
--- a/web/app/view/CalendarDialog.js
+++ b/web/app/view/CalendarDialog.js
@@ -50,9 +50,9 @@ Ext.define('Traccar.view.CalendarDialog', {
}
}, {
xtype: 'hiddenfield',
- name: 'calendarData',
+ name: 'data',
allowBlank: false,
- reference: 'calendarDataField'
+ reference: 'dataField'
}]
}
});
diff --git a/web/app/view/CalendarDialogController.js b/web/app/view/CalendarDialogController.js
index 48400bc..a111ded 100644
--- a/web/app/view/CalendarDialogController.js
+++ b/web/app/view/CalendarDialogController.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.CalendarDialogController', {
if (fileField.fileInputEl.dom.files.length > 0) {
reader = new FileReader();
reader.onload = function (event) {
- fileField.up('window').lookupReference('calendarDataField').setValue(
+ fileField.up('window').lookupReference('dataField').setValue(
btoa(String.fromCharCode.apply(null, new Uint8Array(event.target.result))));
};
reader.onerror = function (event) {