diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-09-15 11:41:08 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-09-15 11:41:08 +1200 |
commit | 34a70e81ecb613c3216fcdd581a9724216137b41 (patch) | |
tree | ee42bc77c1ade262e154f389ba7ebbb17212620b /web | |
parent | 2fa0652494c511a87516fd71e363600b3ef0a1a6 (diff) | |
download | traccar-server-34a70e81ecb613c3216fcdd581a9724216137b41.tar.gz traccar-server-34a70e81ecb613c3216fcdd581a9724216137b41.tar.bz2 traccar-server-34a70e81ecb613c3216fcdd581a9724216137b41.zip |
Rename parameter to attribute
Diffstat (limited to 'web')
-rw-r--r-- | web/app/Application.js | 4 | ||||
-rw-r--r-- | web/app/model/Attribute.js (renamed from web/app/model/Parameter.js) | 2 | ||||
-rw-r--r-- | web/app/store/Attributes.js (renamed from web/app/store/Parameters.js) | 4 | ||||
-rw-r--r-- | web/app/view/state/State.js | 2 | ||||
-rw-r--r-- | web/app/view/state/StateController.js | 8 | ||||
-rw-r--r-- | web/l10n/en.js | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/web/app/Application.js b/web/app/Application.js index 88745265b..9544f21b2 100644 --- a/web/app/Application.js +++ b/web/app/Application.js @@ -28,7 +28,7 @@ Ext.define('Traccar.Application', { 'User', 'Device', 'Position', - 'Parameter', + 'Attribute', 'Command' ], @@ -37,7 +37,7 @@ Ext.define('Traccar.Application', { 'Positions', 'LiveData', 'Users', - 'Parameters', + 'Attributes', 'MapTypes', 'DistanceUnits', 'SpeedUnits', diff --git a/web/app/model/Parameter.js b/web/app/model/Attribute.js index 30aa67719..78acdb1d9 100644 --- a/web/app/model/Parameter.js +++ b/web/app/model/Attribute.js @@ -14,7 +14,7 @@ * limitations under the License. */ -Ext.define('Traccar.model.Parameter', { +Ext.define('Traccar.model.Attribute', { extend: 'Ext.data.Model', fields: [{ diff --git a/web/app/store/Parameters.js b/web/app/store/Attributes.js index 8b34d465b..2019582e5 100644 --- a/web/app/store/Parameters.js +++ b/web/app/store/Attributes.js @@ -14,9 +14,9 @@ * limitations under the License. */ -Ext.define('Traccar.store.Parameters', { +Ext.define('Traccar.store.Attributes', { extend: 'Ext.data.Store', - model: 'Traccar.model.Parameter', + model: 'Traccar.model.Attribute', sorters: [{ property: 'priority' diff --git a/web/app/view/state/State.js b/web/app/view/state/State.js index 681758cb8..99e3a00f7 100644 --- a/web/app/view/state/State.js +++ b/web/app/view/state/State.js @@ -23,7 +23,7 @@ Ext.define('Traccar.view.state.State', { ], controller: 'state', - store: 'Parameters', + store: 'Attributes', title: strings.stateTitle, diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js index c027dddc9..8141b93a3 100644 --- a/web/app/view/state/StateController.js +++ b/web/app/view/state/StateController.js @@ -86,7 +86,7 @@ Ext.define('Traccar.view.state.StateController', { var other; var value; var unit; - var store = Ext.getStore('Parameters'); + var store = Ext.getStore('Attributes'); store.removeAll(); for (var key in position.data) { @@ -100,7 +100,7 @@ Ext.define('Traccar.view.state.StateController', { value = Ext.Date.format(value, styles.dateTimeFormat); } - store.add(Ext.create('Traccar.model.Parameter', { + store.add(Ext.create('Traccar.model.Attribute', { priority: this.keys[key].priority, name: this.keys[key].name, value: this.formatValue(value) @@ -124,7 +124,7 @@ Ext.define('Traccar.view.state.StateController', { value = distanceUnits.convert(value, unit) + ' ' + distanceUnits.getUnitName(unit); } - store.add(Ext.create('Traccar.model.Parameter', { + store.add(Ext.create('Traccar.model.Attribute', { priority: 999, name: key.replace(/^./, function (match) { return match.toUpperCase(); @@ -141,7 +141,7 @@ Ext.define('Traccar.view.state.StateController', { if (found.getCount() > 0) { this.updatePosition(found.first()); } else { - Ext.getStore('Parameters').removeAll(); + Ext.getStore('Attributes').removeAll(); } }, diff --git a/web/l10n/en.js b/web/l10n/en.js index 4c1e0f233..436932a72 100644 --- a/web/l10n/en.js +++ b/web/l10n/en.js @@ -73,7 +73,7 @@ var strings = { mapBingAerial: 'Bing Maps Aerial', stateTitle: 'State', - stateName: 'Parameter', + stateName: 'Attribute', stateValue: 'Value', commandTitle: 'Command', |