mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show Delete Icon in Breadcrumb in Trashbin 

Signed-off-by: Gary Kim <gary@garykim.dev>
This commit is contained in:
Gary Kim 2019-10-05 15:53:07 +08:00
parent 049628a3f5
commit 11d01319c6
No known key found for this signature in database
GPG Key ID: 9349B59FB54594AC
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files/js/breadcrumb.js
View File

@ -200,9 +200,10 @@
* Makes a breadcrumb structure based on the given path * Makes a breadcrumb structure based on the given path
* *
* @param {String} dir path to split into a breadcrumb structure * @param {String} dir path to split into a breadcrumb structure
* @param {String} [rootIcon=icon-home] icon to use for root
* @return {Object.<String, String>} map of {dir: path, name: displayName} * @return {Object.<String, String>} map of {dir: path, name: displayName}
*/ */
_makeCrumbs: function(dir) { _makeCrumbs: function(dir, rootIcon) {
var crumbs = []; var crumbs = [];
var pathToHere = ''; var pathToHere = '';
// trim leading and trailing slashes // trim leading and trailing slashes
@ -221,7 +222,7 @@
name: t('core', 'Home'), name: t('core', 'Home'),
dir: '/', dir: '/',
class: 'crumbhome', class: 'crumbhome',
linkclass: 'icon-home' linkclass: rootIcon || 'icon-home'
}); });
for (var i = 0; i < parts.length; i++) { for (var i = 0; i < parts.length; i++) {
var part = parts[i]; var part = parts[i];

2
apps/files_trashbin/js/files_trashbin.js
View File

File diff suppressed because one or more lines are too long

2
apps/files_trashbin/js/files_trashbin.js.map
View File

File diff suppressed because one or more lines are too long

2
apps/files_trashbin/src/filelist.js
View File

@ -78,7 +78,7 @@
* user friendly name. * user friendly name.
*/ */
this.breadcrumb._makeCrumbs = function() { this.breadcrumb._makeCrumbs = function() {
var parts = OCA.Files.BreadCrumb.prototype._makeCrumbs.apply(this, arguments) var parts = OCA.Files.BreadCrumb.prototype._makeCrumbs.apply(this, [...arguments, 'icon-delete no-hover'])
for (var i = 1; i < parts.length; i++) { for (var i = 1; i < parts.length; i++) {
parts[i].name = getDeletedFileName(parts[i].name) parts[i].name = getDeletedFileName(parts[i].name)
} }

3
core/css/icons.scss
View File

@ -165,7 +165,8 @@ img, object, video, button, textarea, input, select, div[contenteditable='true']
.icon-delete { .icon-delete {
@include icon-color('delete', 'actions', $color-black, 1, true); @include icon-color('delete', 'actions', $color-black, 1, true);
&.no-permission { &.no-permission,
&.no-hover {
&:hover, &:hover,
&:focus { &:focus {
@include icon-color('delete', 'actions', $color-black, 1, true); @include icon-color('delete', 'actions', $color-black, 1, true);

3
core/css/styles.scss
View File

@ -1197,7 +1197,8 @@ div.crumb {
// Some sane max-width for each folder name // Some sane max-width for each folder name
max-width: 200px; max-width: 200px;
&.icon-home { &.icon-home,
&.icon-delete {
// Hide home text // Hide home text
text-indent: -9999px; text-indent: -9999px;
} }