diff options
Diffstat (limited to 'core/js/sharedialoglinkshareview.js')
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index e10193067db..989c10c2c57 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -54,8 +54,8 @@ // hide download 'change .hideDownloadCheckbox': 'onHideDownloadChange', // password - 'focusout input.linkPassText': 'onPasswordEntered', - 'keyup input.linkPassText': 'onPasswordKeyUp', + 'click input.share-pass-submit': 'onPasswordEntered', + 'keyup input.linkPassText': 'onPasswordKeyUp', // check for the enter key 'change .showPasswordCheckbox': 'onShowPasswordClick', 'change .passwordByTalkCheckbox': 'onPasswordByTalkChange', 'change .publicEditingCheckbox': 'onAllowPublicEditingChange', @@ -381,11 +381,12 @@ }, error: function(model, msg) { // destroy old tooltips - $input.tooltip('destroy'); + var $container = $input.parent(); + $container.tooltip('destroy'); $input.addClass('error'); - $input.attr('title', msg); - $input.tooltip({placement: 'bottom', trigger: 'manual'}); - $input.tooltip('show'); + $container.attr('title', msg); + $container.tooltip({placement: 'bottom', trigger: 'manual'}); + $container.tooltip('show'); } }); }, @@ -867,7 +868,6 @@ var isTalkEnabled = oc_appswebroots['spreed'] !== undefined; var sendPasswordByTalk = share.sendPasswordByTalk; - var showHideDownloadCheckbox = !this.model.isFolder(); var hideDownload = share.hideDownload; var maxDate = null; @@ -904,7 +904,6 @@ shareNote: share.note, hasNote: share.note !== '', maxDate: maxDate, - showHideDownloadCheckbox: showHideDownloadCheckbox, hideDownload: hideDownload, isExpirationEnforced: isExpirationEnforced, } |