Merge branch 'master' into disable_vehicle_features

5 files changed, 15 insertions, 11 deletions

diff --git a/web/app/store/AllNotifications.js b/web/app/store/AllNotifications.js
index f25aebc4..61aa75ab 100644
--- a/web/app/store/AllNotifications.js
+++ b/web/app/store/AllNotifications.js
@@ -27,5 +27,8 @@ Ext.define('Traccar.store.AllNotifications', {
         }
     },
     sortOnLoad: true,
-    sorters: { property: 'type', direction : 'ASC' }
+    sorters: {
+        property: 'type',
+        direction: 'ASC'
+    }
 });
diff --git a/web/app/store/AllTimezones.js b/web/app/store/AllTimezones.js
index e5a861b6..2a7fa371 100644
--- a/web/app/store/AllTimezones.js
+++ b/web/app/store/AllTimezones.js
@@ -21,7 +21,7 @@ Ext.define('Traccar.store.AllTimezones', {
 
     sorters: {
         property: 'key',
-        direction : 'ASC'
+        direction: 'ASC'
     },
 
     data: [{
diff --git a/web/app/store/CommandTypes.js b/web/app/store/CommandTypes.js
index 445f937d..a14dd58e 100644
--- a/web/app/store/CommandTypes.js
+++ b/web/app/store/CommandTypes.js
@@ -41,7 +41,7 @@ Ext.define('Traccar.store.CommandTypes', {
             }
         },
         listeners: {
-            'exception' : function (proxy, response) {
+            'exception': function (proxy, response) {
                 Traccar.app.showError(response);
             }
         }
diff --git a/web/app/store/Notifications.js b/web/app/store/Notifications.js
index d79702fc..a672fd43 100644
--- a/web/app/store/Notifications.js
+++ b/web/app/store/Notifications.js
@@ -24,5 +24,8 @@ Ext.define('Traccar.store.Notifications', {
         url: 'api/users/notifications'
     },
     sortOnLoad: true,
-    sorters: { property: 'type', direction : 'ASC' }
+    sorters: {
+        property: 'type',
+        direction: 'ASC'
+    }
 });
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;
         }
     },