diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-27 09:57:39 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-27 09:57:39 +0100 |
| commit | 8c33c5260ab4b7bfdbb31c84d7e5f51e2ca99bc3 (patch) | |
| tree | 1db70b4fb5fba801afce07133ebbfd9f704f4640 /core | |
| parent | 0875a4a18fcdbc40fa856f469c0de77b8fcaf539 (diff) | |
| parent | 0d98e5e456ed9f5ea05a6e8213b0a71da7b84075 (diff) | |
| download | nextcloud-server-8c33c5260ab4b7bfdbb31c84d7e5f51e2ca99bc3.tar.gz nextcloud-server-8c33c5260ab4b7bfdbb31c84d7e5f51e2ca99bc3.zip | |
Merge pull request #19824 from owncloud/ie9-share-donotsendplaceholderaspassword
[IE9] Don't send link share password placeholder
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 74afbc9fe02..29dce21486c 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -13,6 +13,9 @@ OC.Share = {}; } + var PASSWORD_PLACEHOLDER = '**********'; + var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the public link'); + var TEMPLATE = '{{#if shareAllowed}}' + '<span class="icon-loading-small hidden"></span>' + @@ -133,11 +136,6 @@ this.model.saveLinkShare(); } else { this.$el.find('.linkPass').slideToggle(OC.menuSpeed); - // TODO drop with IE8 drop - if($('html').hasClass('ie8')) { - this.$el.find('.linkPassText').attr('placeholder', null); - this.$el.find('.linkPassText').val(''); - } this.$el.find('.linkPassText').focus(); } } else { @@ -182,7 +180,8 @@ var $input = this.$el.find('.linkPassText'); $input.removeClass('error'); var password = $input.val(); - if(password === '') { + // in IE9 the password might be the placeholder due to bugs in the placeholders polyfill + if(password === '' || password === PASSWORD_PLACEHOLDER || password === PASSWORD_PLACEHOLDER_MESSAGE) { return; } @@ -276,7 +275,7 @@ urlLabel: t('core', 'Link'), enablePasswordLabel: t('core', 'Password protect'), passwordLabel: t('core', 'Password'), - passwordPlaceholder: isPasswordSet ? '**********' : t('core', 'Choose a password for the public link'), + passwordPlaceholder: isPasswordSet ? PASSWORD_PLACEHOLDER : PASSWORD_PLACEHOLDER_MESSAGE, isPasswordSet: isPasswordSet, showPasswordCheckBox: showPasswordCheckBox, publicUpload: publicUpload && isLinkShare, @@ -314,6 +313,12 @@ }; } + // TODO drop with IE8 drop + if($('html').hasClass('ie8')) { + this.$el.find('#linkPassText').removeAttr('placeholder'); + this.$el.find('#linkPassText').val(''); + } + this.delegateEvents(); return this; |