diff options
| author | tsmgeek <tsmgeek@gmail.com> | 2017-08-22 00:21:29 +0100 |
|---|---|---|
| committer | tsmgeek <tsmgeek@gmail.com> | 2017-08-22 00:21:29 +0100 |
| commit | fdf35488b5b3cd5725c6c2e179b65377d30c6577 (patch) | |
| tree | da0b3927f3049475cd67977fe093d198920c1c37 /web/app/view/dialog/LoginController.js | |
| parent | f8b98b236fd676fe8945d942842640ddea5bbac8 (diff) | |
| parent | e0bb9b92d07176677b3043530660af3bc30774d7 (diff) | |
| download | trackermap-web-fdf35488b5b3cd5725c6c2e179b65377d30c6577.tar.gz trackermap-web-fdf35488b5b3cd5725c6c2e179b65377d30c6577.tar.bz2 trackermap-web-fdf35488b5b3cd5725c6c2e179b65377d30c6577.zip | |
Merge from upstream, change .eslintrc.json
Diffstat (limited to 'web/app/view/dialog/LoginController.js')
| -rw-r--r-- | web/app/view/dialog/LoginController.js | 10 |
1 files changed, 4 insertions, 6 deletions
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; }, |