aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-01-11 12:10:15 +1100
committerGitHub <noreply@github.com>2017-01-11 12:10:15 +1100
commit68534d93f8414246f43c5cc4bbd892692b3d5f55 (patch)
tree84aaf22f7634a1ed62b6608b2ad7c67cac833116
parent80a1febd87a4c57ef9d0874cfb7ec06d5603e6af (diff)
parentda4fabbd8e854379e4bc4ffb0967feee2d77cfd1 (diff)
downloadtrackermap-web-68534d93f8414246f43c5cc4bbd892692b3d5f55.tar.gz
trackermap-web-68534d93f8414246f43c5cc4bbd892692b3d5f55.tar.bz2
trackermap-web-68534d93f8414246f43c5cc4bbd892692b3d5f55.zip
Merge pull request #382 from Abyss777/cleanup_calendars
Rename calendarData to data
-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 00b076b3..8c44d625 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 2609a6da..795c2c62 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 48400bc5..a111ded6 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) {