diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-18 11:22:48 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-18 11:22:48 +1200 |
| commit | 3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e (patch) | |
| tree | 74f6b995121b615fe39f3d7a23864c37a8db89a8 /web/app/view/dialog | |
| parent | 1e10dfb3c9f93998c6060297b8458f2a3c3df485 (diff) | |
| download | etbsa-traccar-web-3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e.tar.gz etbsa-traccar-web-3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e.tar.bz2 etbsa-traccar-web-3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e.zip | |
Fix various style issues
Diffstat (limited to 'web/app/view/dialog')
| -rw-r--r-- | web/app/view/dialog/CalendarController.js | 2 | ||||
| -rw-r--r-- | web/app/view/dialog/CommandController.js | 2 | ||||
| -rw-r--r-- | web/app/view/dialog/LoginController.js | 10 | ||||
| -rw-r--r-- | web/app/view/dialog/MapPickerController.js | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/web/app/view/dialog/CalendarController.js b/web/app/view/dialog/CalendarController.js index 14d8294..54dc7a3 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 485d994..3fdc7b0 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 1b5cd07..c25d9a8 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 23f60ec..8641e37 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'); }, |