Merge pull request #15639 from rullzer/fix_15368
Reset sharedialog values
This commit is contained in:
commit
37a5b62abb
|
@ -982,6 +982,10 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.checked) {
|
if (this.checked) {
|
||||||
|
// Reset password placeholder
|
||||||
|
$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
|
||||||
|
// Reset link
|
||||||
|
$('#linkText').val('');
|
||||||
var expireDateString = '';
|
var expireDateString = '';
|
||||||
if (oc_appconfig.core.defaultExpireDateEnabled) {
|
if (oc_appconfig.core.defaultExpireDateEnabled) {
|
||||||
var date = new Date().getTime();
|
var date = new Date().getTime();
|
||||||
|
@ -1009,7 +1013,7 @@ $(document).ready(function() {
|
||||||
} else {
|
} else {
|
||||||
$('#linkPass').slideToggle(OC.menuSpeed);
|
$('#linkPass').slideToggle(OC.menuSpeed);
|
||||||
// TODO drop with IE8 drop
|
// TODO drop with IE8 drop
|
||||||
if(html.hasClass('ie8')) {
|
if($('html').hasClass('ie8')) {
|
||||||
$('#linkPassText').attr('placeholder', null);
|
$('#linkPassText').attr('placeholder', null);
|
||||||
$('#linkPassText').val('');
|
$('#linkPassText').val('');
|
||||||
}
|
}
|
||||||
|
@ -1116,7 +1120,6 @@ $(document).ready(function() {
|
||||||
$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
|
$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
|
||||||
var linkPassText = $('#linkPassText');
|
var linkPassText = $('#linkPassText');
|
||||||
if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
|
if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
|
||||||
|
|
||||||
var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
|
var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
|
||||||
var dropDown = $('#dropdown');
|
var dropDown = $('#dropdown');
|
||||||
var itemType = dropDown.data('item-type');
|
var itemType = dropDown.data('item-type');
|
||||||
|
|
|
@ -129,6 +129,100 @@ describe('OC.Share tests', function() {
|
||||||
);
|
);
|
||||||
expect($('#dropdown #linkCheckbox').length).toEqual(0);
|
expect($('#dropdown #linkCheckbox').length).toEqual(0);
|
||||||
});
|
});
|
||||||
|
it('Reset link when password is enforced and link is toggled', function() {
|
||||||
|
var old = oc_appconfig.core.enforcePasswordForPublicLink;
|
||||||
|
oc_appconfig.core.enforcePasswordForPublicLink = true;
|
||||||
|
$('#allowShareWithLink').val('yes');
|
||||||
|
|
||||||
|
OC.Share.showDropDown(
|
||||||
|
'file',
|
||||||
|
123,
|
||||||
|
$container,
|
||||||
|
true,
|
||||||
|
31,
|
||||||
|
'shared_file_name.txt'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Toggle linkshare
|
||||||
|
$('#dropdown [name=linkCheckbox]').click();
|
||||||
|
expect($('#dropdown #linkText').val()).toEqual('');
|
||||||
|
|
||||||
|
// Set password
|
||||||
|
$('#dropdown #linkPassText').val('foo');
|
||||||
|
$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
|
||||||
|
fakeServer.requests[0].respond(
|
||||||
|
200,
|
||||||
|
{ 'Content-Type': 'application/json' },
|
||||||
|
JSON.stringify({data: {token: 'xyz'}, status: 'success'})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Remove link
|
||||||
|
$('#dropdown [name=linkCheckbox]').click();
|
||||||
|
fakeServer.requests[1].respond(
|
||||||
|
200,
|
||||||
|
{ 'Content-Type': 'application/json' },
|
||||||
|
JSON.stringify({status: 'success'})
|
||||||
|
);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Try to share again
|
||||||
|
* The linkText should be emptied
|
||||||
|
*/
|
||||||
|
$('#dropdown [name=linkCheckbox]').click();
|
||||||
|
expect($('#dropdown #linkText').val()).toEqual('');
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Do not set password but untoggle
|
||||||
|
* Since there is no share this should not result in another request to the server
|
||||||
|
*/
|
||||||
|
$('#dropdown [name=linkCheckbox]').click();
|
||||||
|
expect(fakeServer.requests.length).toEqual(2);
|
||||||
|
|
||||||
|
oc_appconfig.core.enforcePasswordForPublicLink = old;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Reset password placeholder when password is enforced and link is toggled', function() {
|
||||||
|
var old = oc_appconfig.core.enforcePasswordForPublicLink;
|
||||||
|
oc_appconfig.core.enforcePasswordForPublicLink = true;
|
||||||
|
$('#allowShareWithLink').val('yes');
|
||||||
|
|
||||||
|
OC.Share.showDropDown(
|
||||||
|
'file',
|
||||||
|
123,
|
||||||
|
$container,
|
||||||
|
true,
|
||||||
|
31,
|
||||||
|
'shared_file_name.txt'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Toggle linkshare
|
||||||
|
$('#dropdown [name=linkCheckbox]').click();
|
||||||
|
expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
|
||||||
|
|
||||||
|
// Set password
|
||||||
|
$('#dropdown #linkPassText').val('foo');
|
||||||
|
$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
|
||||||
|
fakeServer.requests[0].respond(
|
||||||
|
200,
|
||||||
|
{ 'Content-Type': 'application/json' },
|
||||||
|
JSON.stringify({data: {token: 'xyz'}, status: 'success'})
|
||||||
|
);
|
||||||
|
expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('**********');
|
||||||
|
|
||||||
|
// Remove link
|
||||||
|
$('#dropdown [name=linkCheckbox]').click();
|
||||||
|
fakeServer.requests[1].respond(
|
||||||
|
200,
|
||||||
|
{ 'Content-Type': 'application/json' },
|
||||||
|
JSON.stringify({status: 'success'})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Try to share again
|
||||||
|
$('#dropdown [name=linkCheckbox]').click();
|
||||||
|
expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
|
||||||
|
|
||||||
|
oc_appconfig.core.enforcePasswordForPublicLink = old;
|
||||||
|
});
|
||||||
it('shows populated link share when a link share exists', function() {
|
it('shows populated link share when a link share exists', function() {
|
||||||
loadItemStub.returns({
|
loadItemStub.returns({
|
||||||
reshare: [],
|
reshare: [],
|
||||||
|
|
Loading…
Reference in New Issue