diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-08-21 15:32:11 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-08-21 15:32:11 +0200 |
| commit | 9c980954f4cbb0ff023f5065d64b3eb931914be0 (patch) | |
| tree | 07565e70ddf37a72217d66d8496bec9bbfdfe58e /core | |
| parent | 0cb189353f7e7aecf977653aa918b25cc75aee19 (diff) | |
| parent | 98d06094e70d657907b139431624740acde3bbd9 (diff) | |
| download | nextcloud-server-9c980954f4cbb0ff023f5065d64b3eb931914be0.tar.gz nextcloud-server-9c980954f4cbb0ff023f5065d64b3eb931914be0.zip | |
Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowed
Fix share dropdown when links are not allowed
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/share.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/shareSpec.js | 26 |
2 files changed, 17 insertions, 11 deletions
diff --git a/core/js/share.js b/core/js/share.js index 99a767b47f2..f1652370d35 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -503,7 +503,7 @@ OC.Share={ .append( insert ) .appendTo( ul ); }; - if (link) { + if (link && linksAllowed) { $('#email').autocomplete({ minLength: 1, source: function (search, response) { diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js index 1fd36dfff04..06c4b98df2a 100644 --- a/core/js/tests/specs/shareSpec.js +++ b/core/js/tests/specs/shareSpec.js @@ -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' ); |