From 3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 18 Aug 2017 11:22:48 +1200 Subject: Fix various style issues --- web/app/view/dialog/CalendarController.js | 2 +- web/app/view/dialog/CommandController.js | 2 ++ web/app/view/dialog/LoginController.js | 10 ++++------ web/app/view/dialog/MapPickerController.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'web/app/view/dialog') diff --git a/web/app/view/dialog/CalendarController.js b/web/app/view/dialog/CalendarController.js index 14d8294a..54dc7a3b 100644 --- a/web/app/view/dialog/CalendarController.js +++ b/web/app/view/dialog/CalendarController.js @@ -26,7 +26,7 @@ Ext.define('Traccar.view.dialog.CalendarController', { reader = new FileReader(); reader.onload = function (event) { fileField.up('window').lookupReference('dataField').setValue( - btoa(String.fromCharCode.apply(null, new Uint8Array(event.target.result)))); + btoa(String.fromCharCode.apply(null, new Uint8Array(event.target.result)))); }; reader.onerror = function (event) { Traccar.app.showError(event.target.error); diff --git a/web/app/view/dialog/CommandController.js b/web/app/view/dialog/CommandController.js index 485d994d..3fdc7b0c 100644 --- a/web/app/view/dialog/CommandController.js +++ b/web/app/view/dialog/CommandController.js @@ -97,6 +97,8 @@ Ext.define('Traccar.view.dialog.CommandController', { data: value }); break; + default: + break; } Ext.Ajax.request({ diff --git a/web/app/view/dialog/LoginController.js b/web/app/view/dialog/LoginController.js index 1b5cd072..c25d9a83 100644 --- a/web/app/view/dialog/LoginController.js +++ b/web/app/view/dialog/LoginController.js @@ -86,14 +86,12 @@ Ext.define('Traccar.view.dialog.LoginController', { prefix = url.substring(0, url.indexOf(paramName)); suffix = url.substring(url.indexOf(paramName)); suffix = suffix.substring(suffix.indexOf('=') + 1); - suffix = (suffix.indexOf('&') >= 0) ? suffix.substring(suffix.indexOf('&')) : ''; + suffix = suffix.indexOf('&') >= 0 ? suffix.substring(suffix.indexOf('&')) : ''; url = prefix + paramName + '=' + paramValue + suffix; + } else if (url.indexOf('?') < 0) { + url += '?' + paramName + '=' + paramValue; } else { - if (url.indexOf('?') < 0) { - url += '?' + paramName + '=' + paramValue; - } else { - url += '&' + paramName + '=' + paramValue; - } + url += '&' + paramName + '=' + paramValue; } window.location.href = url; }, diff --git a/web/app/view/dialog/MapPickerController.js b/web/app/view/dialog/MapPickerController.js index 23f60ece..8641e377 100644 --- a/web/app/view/dialog/MapPickerController.js +++ b/web/app/view/dialog/MapPickerController.js @@ -30,7 +30,7 @@ Ext.define('Traccar.view.dialog.MapPickerController', { } }, - getMapState: function (button) { + getMapState: function () { this.fireEvent('mapstaterequest'); }, -- cgit v1.2.3