[Pkg-owncloud-commits] [owncloud] 105/129: [IE9] Don't send link share password placeholder

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit ee1e7d972612e47ee45894832792c1ed783181e1
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Oct 16 11:55:23 2015 +0200

    [IE9] Don't send link share password placeholder
    
    When exiting the password field in the share dialog, IE9 would
    mistakenly think that the password has changed and would send the
    placeholder.
    
    This fix prevents changing the password whenever the placeholder is set
    as value.
---
 core/js/sharedialoglinkshareview.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 74afbc9..29dce21 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git