[Pkg-owncloud-commits] [owncloud] 49/129: Merge pull request #19835 from owncloud/stable8.2-share-checkboxuniqueids

[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 7ddbaf649fea4f010b09107ffe1cce457b46649b
Merge: 9c5dcb4 68f0d10
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Oct 20 15:34:54 2015 +0200

    Merge pull request #19835 from owncloud/stable8.2-share-checkboxuniqueids
    
    [stable8.2] Fix DOM element ids in share dialog

 core/js/sharedialogexpirationview.js       |  16 +++--
 core/js/sharedialoglinkshareview.js        | 103 ++++++++++++++++-------------
 core/js/sharedialogshareelistview.js       |  35 +++++-----
 core/js/sharedialogview.js                 |  11 +--
 core/js/tests/specs/sharedialogviewSpec.js |  70 +++++++++++---------
 5 files changed, 127 insertions(+), 108 deletions(-)

diff --cc core/js/tests/specs/sharedialogviewSpec.js
index fe4cf8e,c80f641..be926a7
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@@ -380,9 -384,19 +384,9 @@@ describe('OC.Share.ShareDialogView', fu
  				dialog.$el.find('[name=expirationCheckbox]').click();
  				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
  			});
 -			it('displayes email form when sending emails is enabled', function() {
 -				$('input[name=mailPublicNotificationEnabled]').val('yes');
 -				dialog.render();
 -				expect(dialog.$('#emailPrivateLink').length).toEqual(1);
 -			});
 -			it('not renders email form when sending emails is disabled', function() {
 -				$('input[name=mailPublicNotificationEnabled]').val('no');
 -				dialog.render();
 -				expect(dialog.$('#emailPrivateLink').length).toEqual(0);
 -			});
  			it('sets picker minDate to today and no maxDate by default', function() {
  				dialog.render();
- 				dialog.$el.find('[name=linkCheckbox]').click();
+ 				dialog.$el.find('.linkCheckbox').click();
  				dialog.$el.find('[name=expirationCheckbox]').click();
  				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
  				expect($.datepicker._defaults.maxDate).toEqual(null);

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