diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-06 10:31:48 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-06 10:32:00 +0100 |
| commit | eeeb19079f3c6a8893f451ca8abb2f5d585390ed (patch) | |
| tree | 13ef827f96ce86ce18bb7ce00b009134d79de3a7 /core | |
| parent | 11b6c225959601330321733646e5957a374a8aec (diff) | |
| download | nextcloud-server-eeeb19079f3c6a8893f451ca8abb2f5d585390ed.tar.gz nextcloud-server-eeeb19079f3c6a8893f451ca8abb2f5d585390ed.zip | |
Add focus on pending popover opening
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars | 2 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 4 | ||||
| -rw-r--r-- | core/js/sharetemplates.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars b/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars index 787f50c6c1e..d9ff5659fc9 100644 --- a/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars +++ b/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars @@ -1,4 +1,4 @@ -<div class="popovermenu open menu"> +<div class="popovermenu open menu pending"> <ul> {{#if isPasswordEnforced}} <li> diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 5dc7d706720..4f4db0eec79 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -229,8 +229,8 @@ // We need a password before the share creation if (isPasswordEnforced && !this.showPending && this.password === '') { this.showPending = shareId; - this.render(); - $li.find('#enforcedPassText').focus(); + var self = this.render(); + self.$el.find('.pending #enforcedPassText').focus(); } else { // else, we have a password or it is not enforced $.when(this.model.saveLinkShare(shareData, { diff --git a/core/js/sharetemplates.js b/core/js/sharetemplates.js index 619215d8083..eb3489f6b4e 100644 --- a/core/js/sharetemplates.js +++ b/core/js/sharetemplates.js @@ -271,7 +271,7 @@ templates['sharedialoglinkshareview_popover_menu_pending'] = template({"1":funct },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1; - return "<div class=\"popovermenu open menu\">\n <ul>\n" + return "<div class=\"popovermenu open menu pending\">\n <ul>\n" + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.isPasswordEnforced : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + " </ul>\n</div>\n"; },"useData":true}); |