aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/state
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-15 11:51:45 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-15 11:51:45 +1200
commit5cf1061cfcc5baf214bce145961512fd4f672621 (patch)
tree32efac22ba11abddec21656685c3e0ba730b1e47 /web/app/view/state
parent34a70e81ecb613c3216fcdd581a9724216137b41 (diff)
downloadtrackermap-server-5cf1061cfcc5baf214bce145961512fd4f672621.tar.gz
trackermap-server-5cf1061cfcc5baf214bce145961512fd4f672621.tar.bz2
trackermap-server-5cf1061cfcc5baf214bce145961512fd4f672621.zip
Rename other field to attributes
Diffstat (limited to 'web/app/view/state')
-rw-r--r--web/app/view/state/StateController.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 8141b93a3..36978c3d0 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -83,7 +83,7 @@ Ext.define('Traccar.view.state.StateController', {
updatePosition: function(position) {
- var other;
+ var attributes;
var value;
var unit;
var store = Ext.getStore('Attributes');
@@ -108,16 +108,16 @@ Ext.define('Traccar.view.state.StateController', {
}
}
- var xml = position.get('other');
+ var xml = position.get('attributes');
if (typeof xml === 'string' || xml instanceof String) {
- other = this.parseXml(xml);
+ attributes = this.parseXml(xml);
} else {
- other = xml;
+ attributes = xml;
}
- for (var key in other) {
- if (other.hasOwnProperty(key)) {
+ for (var key in attributes) {
+ if (attributes.hasOwnProperty(key)) {
- value = other[key];
+ value = attributes[key];
if (key === 'distance' || key === 'odometer') {
var distanceUnits = Ext.getStore('DistanceUnits');
unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';