diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js index 4bed6a1a2..a2b874d90 100644 --- a/www/common/proxy-manager.js +++ b/www/common/proxy-manager.js @@ -464,7 +464,10 @@ define([ // convert a folder to a Shared Folder var _convertFolderToSharedFolder = function (Env, data, cb) { - var path = data.path; + return void cb({ + error: 'DISABLED' + }); // XXX CONVERT + /*var path = data.path; var folderElement = Env.user.userObject.find(path); // don't try to convert top-level elements (trash, root, etc) to shared-folders // TODO also validate that you're in root (not templates, etc) @@ -554,7 +557,7 @@ define([ Env.user.userObject.delete([path], function () { cb(); }); - }); + });*/ }; // Delete permanently some pads or folders diff --git a/www/drive/inner.js b/www/drive/inner.js index 987eeb16d..604fce2f8 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -1162,6 +1162,7 @@ define([ hide.push('collapseall'); } containsFolder = true; + hide.push('share'); // XXX CONVERT hide.push('openro'); hide.push('openincode'); hide.push('properties'); @@ -3933,7 +3934,8 @@ define([ }); } else if (manager.isFolder(el)) { // Folder // if folder is inside SF - if (manager.isInSharedFolder(paths[0].path)) { + return UI.warn('ERROR: Temporarily disabled'); // XXX CONVERT + /*if (manager.isInSharedFolder(paths[0].path)) { return void UI.alert(Messages.convertFolderToSF_SFParent); } // if folder already contains SF @@ -3963,7 +3965,7 @@ define([ var owned = Util.isChecked($(convertContent).find('#cp-upload-owned')); manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh); }); - } + }*/ } else { // File data = manager.getFileData(el); parsed = Hash.parsePadUrl(data.href);