diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-04-26 00:11:55 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-04-26 00:50:38 +0200 |
| commit | 241e397326545ee3ecad1a6a50dbe7839faa5c21 (patch) | |
| tree | 6d33b4e4cc22bb1bf4753d83f44e1bb8422082e3 /core/js | |
| parent | 0f0b04b7d9b4fa8c3c74218c222194f0f2f9e8b7 (diff) | |
| parent | 255c7df3bdbaccf00ba8e9fb00e750ffb9a50356 (diff) | |
| download | nextcloud-server-241e397326545ee3ecad1a6a50dbe7839faa5c21.tar.gz nextcloud-server-241e397326545ee3ecad1a6a50dbe7839faa5c21.zip | |
Merge branch 'master' into contactsmenu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 1 | ||||
| -rw-r--r-- | core/js/login/authpicker.js | 13 | ||||
| -rw-r--r-- | core/js/login/redirect.js | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index 03d831567d3..d601f79033e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1515,7 +1515,6 @@ function initCore() { var appList = $('#appmenu li'); var availableWidth = $('#header-left').width() - $('#nextcloud').width() - 44; var appCount = Math.floor((availableWidth)/44); - console.log(appCount); // show a maximum of 8 apps if(appCount >= maxApps) { appCount = maxApps; diff --git a/core/js/login/authpicker.js b/core/js/login/authpicker.js new file mode 100644 index 00000000000..6d8a6bb4160 --- /dev/null +++ b/core/js/login/authpicker.js @@ -0,0 +1,13 @@ +jQuery(document).ready(function() { + $('#app-token-login').click(function (e) { + e.preventDefault(); + $(this).addClass('hidden'); + $('#redirect-link').addClass('hidden'); + $('#app-token-login-field').removeClass('hidden'); + }); + + $('#submit-app-token-login').click(function(e) { + e.preventDefault(); + window.location.href = 'nc://' + encodeURIComponent($('#user').val()) + ':' + encodeURIComponent($('#password').val()) + '@' + encodeURIComponent($('#serverHost').val()); + }); +}); diff --git a/core/js/login/redirect.js b/core/js/login/redirect.js new file mode 100644 index 00000000000..ea214feab2d --- /dev/null +++ b/core/js/login/redirect.js @@ -0,0 +1,3 @@ +jQuery(document).ready(function() { + $('#submit-redirect-form').trigger('click'); +}); |