diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 96c9017dbf..afe31a75d0 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -360,7 +360,8 @@ $(document).ready(function() { $(this).select(); }); - $('#emailPrivateLink').live('submit', function() { + $('#emailPrivateLink').live('submit', function(event) { + event.preventDefault(); OC.Share.emailPrivateLink(); }); }); \ No newline at end of file diff --git a/core/js/multiselect.js b/core/js/multiselect.js index db5afa637c..c4fd74b047 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -35,6 +35,7 @@ } button.click(function(event){ + var button=$(this); if(button.parent().children('ul').length>0){ button.parent().children('ul').slideUp(400,function(){ @@ -128,19 +129,30 @@ if(event.keyCode == 13) { event.preventDefault(); event.stopPropagation(); + var value = $(this).val(); + var exists = false; + $.each(options,function(index, item) { + if ($(item).val() == value) { + exists = true; + return false; + } + }); + if (exists) { + return false; + } var li=$(this).parent(); $(this).remove(); li.text('+ '+settings.createText); li.before(createItem(this)); var select=button.parent().next(); var option=$(''); + } + }) + }; element.multiSelect({ + createCallback:addGroup, createText:'add group', checked:checked, oncheck:checkHandeler, @@ -213,6 +221,5 @@ $(document).ready(function(){ } } ); - location.reload(); }); });