diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index 063cc71be..7c428a3de 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -750,7 +750,7 @@ } } - .cp-app-drive-path { + & > .cp-app-drive-path { width: 100%; height: @variables_bar-height; line-height: @variables_bar-height; diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index dd8630baa..71eda177f 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -2241,6 +2241,7 @@ define([ var isVirtual = virtualCategories.indexOf(path[0]) !== -1; var el = isVirtual ? undefined : manager.find(path); path = path[0] === SEARCH ? path.slice(0,1) : path; + var isInTrashRoot = manager.isInTrashRoot(path); var $outer = $('
', {'class': 'cp-app-drive-path'}); var $inner = $('
', {'class': 'cp-app-drive-path-inner'}); @@ -2251,9 +2252,12 @@ define([ path.forEach(function (p, idx) { if (skipNext) { skipNext = false; return; } if (isTrash && [2,3].indexOf(idx) !== -1) { return; } - var name = p; + if (manager.isFile(el) && isInTrashRoot && idx === 1) { + idx = 3; + } + var currentEl = isVirtual ? undefined : manager.find(path.slice(0, idx+1)); if (p === SHARED_FOLDER || (currentEl && manager.isSharedFolder(currentEl))) { name = manager.getSharedFolderData(currentEl || APP.newSharedFolder).title; @@ -3258,6 +3262,7 @@ define([ $list.append($element); }); }); + setTimeout(collapseDrivePath); }; var displayRecent = function ($list) {