[Pkg-owncloud-commits] [owncloud] 59/129: Merge pull request #19844 from owncloud/stable8.2-share-fix-spinner-position

[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 7164178cd3897fdd45de3ae1b5e267428ad1fb35
Merge: 0f3adb8 063c2db
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Oct 20 15:49:28 2015 +0200

    Merge pull request #19844 from owncloud/stable8.2-share-fix-spinner-position
    
    [stable8.2] Fix spinner positions in share tab

 apps/files_sharing/css/sharetabview.css | 14 +++++++++++---
 core/js/sharedialoglinkshareview.js     |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --cc core/js/sharedialoglinkshareview.js
index dfd9bdc,7f1916f..beb8b01
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@@ -132,15 -115,16 +132,16 @@@
  					// this will create it
  					this.model.saveLinkShare();
  				} else {
 -					this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
 +					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').attr('placeholder', null);
 +						this.$el.find('.linkPassText').val('');
  					}
 -					this.$el.find('#linkPassText').focus();
 +					this.$el.find('.linkPassText').focus();
  				}
  			} else {
+ 				$loading.removeClass('hidden');
  				if (this.model.get('linkShare').isLinkShare) {
  					this.model.removeLinkShare();
  				} else {

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