diff options
author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-16 20:21:18 -0400 |
---|---|---|
committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-16 20:21:18 -0400 |
commit | 582dca4d91186723a142c29a344be5c6d060061e (patch) | |
tree | 1391c7f9668c1674c3839c3cfa61cfabcf1d801b /apps/files_sharing/js/share.js | |
parent | 9c3a8360442c1a83cee630d3742ad5a3025c18a3 (diff) | |
download | nextcloud-server-582dca4d91186723a142c29a344be5c6d060061e.tar.gz nextcloud-server-582dca4d91186723a142c29a344be5c6d060061e.zip |
Initial merging of files_sharing and files_publiclink
Diffstat (limited to 'apps/files_sharing/js/share.js')
-rw-r--r-- | apps/files_sharing/js/share.js | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index d9d64d96a0b..18d8da85403 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -136,23 +136,29 @@ $(document).ready(function() { $('#makelink').live('change', function() { if (this.checked) { - var data = 'path='+$('#dropdown').data('file')+'&expire=0'; + var source = $('#dropdown').data('file'); + var uid_shared_with = "public"; + var permissions = 0; + var data = 'sources='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with)+'&permissions='+encodeURIComponent(permissions); $.ajax({ - type: 'GET', - url: OC.linkTo('files_publiclink','ajax/makelink.php'), + type: 'POST', + url: OC.linkTo('files_sharing','ajax/share.php'), cache: false, data: data, - success: function(token) { - if (token) { + success: function(result) { + if (result !== 'false') { + var token = 1234; showPublicLink(token); } } }); } else { - var data = 'token='+$('#link').data('token'); + var source = $('#dropdown').data('file'); + var uid_shared_with = "public"; + var data = 'source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with); $.ajax({ type: 'GET', - url: OC.linkTo('files_publiclink','ajax/deletelink.php'), + url: OC.linkTo('files_sharing','ajax/unshare.php'), cache: false, data: data, success: function(){ @@ -207,11 +213,11 @@ function createDropdown(filename, files) { }); } }); - $.getJSON(OC.linkTo('files_publiclink', 'ajax/getlink.php'), { path: files }, function(token) { - if (token) { - showPublicLink(token); - } - }); +// $.getJSON(OC.linkTo('files_publiclink', 'ajax/getlink.php'), { path: files }, function(token) { +// if (token) { +// showPublicLink(token); +// } +// }); $('#dropdown').show('blind'); $('#share_with').chosen(); } |