aboutsummaryrefslogtreecommitdiff
path: root/web/app/store/PositionAttributes.js
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-08-18 11:52:06 +0500
committerAbyss777 <abyss@fox5.ru>2017-08-18 11:52:06 +0500
commit65116928b2b7a8e5e2b70bf490b3225896cf2c71 (patch)
treeaf24b231822fb045a7ae4d03e533775285d41e47 /web/app/store/PositionAttributes.js
parent01af5f520e24a33d7e22523d8ed11e9f14a19516 (diff)
parentb3d3c720f34e12e7af83e6be3bd87e304931bbe1 (diff)
downloadtrackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.gz
trackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.bz2
trackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.zip
Merge branch 'master' into disable_vehicle_features
Diffstat (limited to 'web/app/store/PositionAttributes.js')
-rw-r--r--web/app/store/PositionAttributes.js12
1 files changed, 5 insertions, 7 deletions
diff --git a/web/app/store/PositionAttributes.js b/web/app/store/PositionAttributes.js
index c3d6d180..e457dafc 100644
--- a/web/app/store/PositionAttributes.js
+++ b/web/app/store/PositionAttributes.js
@@ -240,14 +240,12 @@ Ext.define('Traccar.store.PositionAttributes', {
var model = this.getById(key);
if (model) {
return model.get('name');
+ } else if (capitalize) {
+ return key.replace(/^./, function (match) {
+ return match.toUpperCase();
+ });
} else {
- if (capitalize) {
- return key.replace(/^./, function (match) {
- return match.toUpperCase();
- });
- } else {
- return key;
- }
+ return key;
}
},