wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix share dropdown when links are not allowed

Browse source 
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.

The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.
This commit is contained in:
Vincent Petry 2014-08-21 13:49:02 +02:00
parent 36c88e2830
commit 98d06094e7
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/share.js
View file

@ -503,7 +503,7 @@ OC.Share={
.append( insert )
.appendTo( ul );
};
if (link) {
if (link && linksAllowed) {
$('#email').autocomplete({
minLength: 1,
source: function (search, response) {

26
core/js/tests/specs/shareSpec.js
View file

@ -44,6 +44,12 @@ describe('OC.Share tests', function() {
autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
// dummy container with the expected attributes
if (!$(this).length) {
// simulate the real autocomplete that returns
// nothing at all when no element is specified
// (and potentially break stuff)
return null;
}
var $el = $('<div></div>').data('ui-autocomplete', {});
return $el;
});
@ -60,7 +66,7 @@ describe('OC.Share tests', function() {
'file',
123,
$container,
'http://localhost/dummylink',
true,
31,
'shared_file_name.txt'
);
@ -73,7 +79,7 @@ describe('OC.Share tests', function() {
'file',
123,
$container,
'http://localhost/dummylink',
true,
31,
'shared_file_name.txt'
);
@ -92,7 +98,7 @@ describe('OC.Share tests', function() {
'file',
123,
$container,
'http://localhost/dummylink',
true,
31,
'shared_file_name.txt'
);
@ -104,7 +110,7 @@ describe('OC.Share tests', function() {
'file',
123,
$container,
'http://localhost/dummylink',
true,
31,
'shared_file_name.txt'
);
@ -138,7 +144,7 @@ describe('OC.Share tests', function() {
'file',
123,
$container,
'http://localhost/dummylink',
true,
31,
'folder'
);
@ -176,7 +182,7 @@ describe('OC.Share tests', function() {
'file',
456, // another file
$container,
'http://localhost/dummylink',
true,
31,
'folder'
);
@ -230,7 +236,7 @@ describe('OC.Share tests', function() {
'folder',
123,
$container,
'http://localhost/dummylink',
true,
31,
'folder'
);
@ -245,7 +251,7 @@ describe('OC.Share tests', function() {
'file',
456,
$container,
'http://localhost/dummylink',
true,
31,
'file_in_folder.txt'
);
@ -266,7 +272,7 @@ describe('OC.Share tests', function() {
'file',
123,
$container,
'http://localhost/dummylink',
true,
31,
'folder'
);
@ -407,7 +413,7 @@ describe('OC.Share tests', function() {
'file',
123,
$container,
'http://localhost/dummylink',
true,
31,
'shared_file_name.txt'
);