aboutsummaryrefslogtreecommitdiff
path: root/web/app/AttributeFormatter.js
diff options
context:
space:
mode:
authortsmgeek <tsmgeek@gmail.com>2017-08-22 00:26:01 +0100
committertsmgeek <tsmgeek@gmail.com>2017-08-22 00:26:01 +0100
commit7e2fb28b558f404442bec67a7551e75fc90ff100 (patch)
tree1fa898c25d4fb3695c34f1e96507e61b6d3da7b8 /web/app/AttributeFormatter.js
parentfdf35488b5b3cd5725c6c2e179b65377d30c6577 (diff)
downloadtrackermap-web-7e2fb28b558f404442bec67a7551e75fc90ff100.tar.gz
trackermap-web-7e2fb28b558f404442bec67a7551e75fc90ff100.tar.bz2
trackermap-web-7e2fb28b558f404442bec67a7551e75fc90ff100.zip
Fix typos
Diffstat (limited to 'web/app/AttributeFormatter.js')
-rw-r--r--web/app/AttributeFormatter.js40
1 files changed, 1 insertions, 39 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 7ccf84b4..957992da 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -188,7 +188,6 @@ Ext.define('Traccar.AttributeFormatter', {
getAttributeFormatter: function (key) {
var dataType = Ext.getStore('PositionAttributes').getAttributeDataType(key);
-<<<<<<< HEAD
switch (dataType) {
case 'distance':
@@ -209,36 +208,13 @@ Ext.define('Traccar.AttributeFormatter', {
return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedLiterPerHourAbbreviation);
default:
return this.defaultFormatter;
-=======
- if (!dataType) {
- return this.defaultFormatter;
- } else if (dataType === 'distance') {
- return this.distanceFormatter;
- } else if (dataType === 'speed') {
- return this.speedFormatter;
- } else if (dataType === 'driverUniqueId') {
- return this.driverUniqueIdFormatter;
- } else if (dataType === 'voltage') {
- return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedVoltAbbreviation);
- } else if (dataType === 'percentage') {
- return this.numberFormatterFactory(Traccar.Style.numberPrecision, '&#37;');
- } else if (dataType === 'temperature') {
- return this.numberFormatterFactory(Traccar.Style.numberPrecision, '&deg;C');
- } else if (dataType === 'volume') {
- return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedLiterAbbreviation);
- } else if (dataType === 'consumption') {
- return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedLiterPerHourAbbreviation);
- } else {
- return this.defaultFormatter;
->>>>>>> e0bb9b92d07176677b3043530660af3bc30774d7
}
},
getAttributeConverter: function (key) {
var dataType = Ext.getStore('PositionAttributes').getAttributeDataType(key);
-<<<<<<< HEAD
- switch (dataType){
+ switch (dataType) {
case 'distance':
return this.distanceConverter;
case 'speed':
@@ -247,20 +223,6 @@ Ext.define('Traccar.AttributeFormatter', {
return function (value) {
return value;
};
-=======
- if (!dataType) {
- return function (value) {
- return value;
- };
- } else if (dataType === 'distance') {
- return this.distanceConverter;
- } else if (dataType === 'speed') {
- return this.speedConverter;
- } else {
- return function (value) {
- return value;
- };
->>>>>>> e0bb9b92d07176677b3043530660af3bc30774d7
}
}
});