diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-24 10:01:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 10:01:06 +0100 |
| commit | df4d1f7b78d54448061c6bc27c1aff4275c9cdf3 (patch) | |
| tree | d362e949afb547693f4b36478ce8ad8df3e6c894 /core/js | |
| parent | 34632de1024fac6e5d88312bd707f9064b6fc3f4 (diff) | |
| parent | a9dc3239b3ec67ccdf4e01361d69358cb1415669 (diff) | |
| download | nextcloud-server-df4d1f7b78d54448061c6bc27c1aff4275c9cdf3.tar.gz nextcloud-server-df4d1f7b78d54448061c6bc27c1aff4275c9cdf3.zip | |
Merge pull request #4022 from nextcloud/downstream-27105
Remove auto-focus on certain input fields
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 4 | ||||
| -rw-r--r-- | core/js/sharedialogview.js | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index e7bea516be0..7e3ce923ef9 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -259,7 +259,9 @@ password: '' }); } else { - this.$el.find('.linkPassText').focus(); + if (!OC.Util.isIE()) { + this.$el.find('.linkPassText').focus(); + } } }, diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 47471955563..16a2be0c4a9 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -397,9 +397,11 @@ if (!this._loadingOnce) { this._loadingOnce = true; // the first time, focus on the share field after the spinner disappeared - _.defer(function() { - self.$('.shareWithField').focus(); - }); + if (!OC.Util.isIE()) { + _.defer(function () { + self.$('.shareWithField').focus(); + }); + } } }, |