diff --git a/www/common/sframe-common-interface.js b/www/common/sframe-common-interface.js index 7c8aa2b10..87f507b57 100644 --- a/www/common/sframe-common-interface.js +++ b/www/common/sframe-common-interface.js @@ -320,9 +320,9 @@ define([ $container.html(''); var unit = Util.magnitudeOfBytes(limit); - var usage = unit === 'GB'? Util.bytesToGigabytes(usage): + usage = unit === 'GB'? Util.bytesToGigabytes(usage): Util.bytesToMegabytes(usage); - var limit = unit === 'GB'? Util.bytesToGigabytes(limit): + limit = unit === 'GB'? Util.bytesToGigabytes(limit): Util.bytesToMegabytes(limit); var $limit = $('', {'class': 'cp-limit-bar'}).appendTo($container); diff --git a/www/drive/inner.js b/www/drive/inner.js index 9c1072954..f8ed897ed 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -180,7 +180,7 @@ define([ var $sortAscIcon = $('', {"class": "fa fa-angle-up sortasc"}); var $sortDescIcon = $('', {"class": "fa fa-angle-down sortdesc"}); var $closeIcon = $('', {"class": "fa fa-window-close"}); - var $backupIcon = $('', {"class": "fa fa-life-ring"}); + //var $backupIcon = $('', {"class": "fa fa-life-ring"}); var $searchIcon = $('', {"class": "fa fa-search cp-app-drive-tree-search-con"}); var $addIcon = $('', {"class": "fa fa-plus"}); var $renamedIcon = $('', {"class": "fa fa-flag"}); @@ -2866,20 +2866,10 @@ define([ } }; - var migrateAnonDrive = function (proxy, cb) { - if (sessionStorage.migrateAnonDrive) { - Merge.anonDriveIntoUser(proxy, function () { - delete sessionStorage.migrateAnonDrive; - if (typeof(cb) === "function") { cb(); } - }); - } else { - if (typeof(cb) === "function") { cb(); } - } - }; - var main = function () { var common; var proxy; + var readOnly; nThen(function (waitFor) { $(waitFor(function () { @@ -2929,7 +2919,6 @@ define([ }); metadataMgr = common.getMetadataMgr(); - readOnly = metadataMgr.getPrivateData().readOnly; var configTb = { displayed: ['useradmin', 'pageTitle', 'newpad', 'limit'], @@ -2941,11 +2930,10 @@ define([ sfCommon: common, $container: APP.$bar }; - toolbar = APP.toolbar = Toolbar.create(configTb); + var toolbar = APP.toolbar = Toolbar.create(configTb); var $rightside = toolbar.$rightside; $rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar - var $userBlock = toolbar.$userAdmin; APP.$displayName = APP.$bar.find('.' + Toolbar.constants.username); /* add the usage */