From da4fabbd8e854379e4bc4ffb0967feee2d77cfd1 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 10 Jan 2017 13:31:30 +0500 Subject: Rename calendarData to data --- web/app/model/Calendar.js | 2 +- web/app/view/CalendarDialog.js | 4 ++-- web/app/view/CalendarDialogController.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'web/app') 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) { -- cgit v1.2.3