Skip to content

Commit

Permalink
Minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
felixheidecke committed Oct 28, 2019
1 parent 9d4d2b6 commit 49f01a6
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 33 deletions.
50 changes: 22 additions & 28 deletions apps/files/css/files.css
Original file line number Diff line number Diff line change
Expand Up @@ -522,16 +522,16 @@ table td.filename .uploadtext {

#fileList tr:not(:hover):not(.selected) td.filename .thumbnail.sharetree-item:after {
position: absolute;
display: block;
content: '';
bottom: 0px;
right: -5px;
z-index: 10;
background-image: url(../img/shareinfo.svg);
width: 14px;
height: 14px;
background-repeat: no-repeat;
background-position: center;
display: block;
content: '';
bottom: 0px;
right: -5px;
z-index: 10;
background-image: url(../img/shareinfo.svg);
width: 14px;
height: 14px;
background-repeat: no-repeat;
background-position: center;
}

.shareTree {
Expand All @@ -552,7 +552,7 @@ table td.filename .uploadtext {
border-radius: 50%;
float: left;
margin-right: 10px;
transform: translateY(5px);
margin-top: 5px;
}

.shareTree-item-icon {
Expand All @@ -569,12 +569,6 @@ table td.filename .uploadtext {
display: block;
}

.shareTree-item-path:before,
.shareTree-item-path:after {
content: '"';
}


/* Show checkbox when hovering, checked, or selected */
html.ie8 #fileList tr td.filename > .selectCheckBox:checked,
html.ie8 #fileList tr.selected td.filename > .selectCheckBox,
Expand Down Expand Up @@ -1044,11 +1038,11 @@ html.ie8 #controls .button.new {
sharing indicator on the top right is still pending
---------------------------------------------------
#controls #shareinfo_indicator {
#controls #shareinfo_indicator {
float: right;
height: 32px;
position: relative;
align-items: center;
height: 32px;
position: relative;
align-items: center;
padding: 6px 7px 0 0;
}
Expand All @@ -1066,13 +1060,13 @@ html.ie8 #controls .button.new {
#controls #shareinfo_indicator .text:after {
content: "";
position: absolute;
width: 0;
height: 0;
border-style: solid;
border-width: 4px 4px 0 4px;
border-color: #927800 transparent transparent transparent;
right: 10px;
top: calc(50% - 2px);
width: 0;
height: 0;
border-style: solid;
border-width: 4px 4px 0 4px;
border-color: #927800 transparent transparent transparent;
right: 10px;
top: calc(50% - 2px);
}
#controls #shareinfo_indicator:not(:hover) .list {
Expand Down
10 changes: 5 additions & 5 deletions apps/files/js/filelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -1092,8 +1092,8 @@

this.$fileList.trigger(jQuery.Event('updated'));

this._setShareTree().then(function() {
$('#filestable').trigger(jQuery.Event('shareTreeSet'));
this._updateShareTree().then(function() {
$('#filestable').trigger(jQuery.Event('shareTreeUpdated'));
});

_.defer(function() {
Expand Down Expand Up @@ -1508,7 +1508,7 @@
}
});

$('#filestable').on('shareTreeSet', function() {
$('#filestable').on('shareTreeUpdated', function() {
self._setShareTreeIcons();
})
},
Expand Down Expand Up @@ -1856,7 +1856,7 @@
return Promise.all(crumbs)
},

_setShareTree: function() {
_updateShareTree: function() {
let self = this;

return this.getPathShareInfo(this.getCurrentDirectory()).then(function(path) {
Expand All @@ -1872,7 +1872,7 @@

// Add share-tree icon to files and folders
// each per <tr> in the table
$('#fileList tr td.filename .thumbnail:not(.sharetree-item)').addClass('sharetree-item')
this.$el.find('#fileList tr td.filename .thumbnail:not(.sharetree-item)').addClass('sharetree-item')
},

_setShareTreeView: function() {
Expand Down

0 comments on commit 49f01a6

Please sign in to comment.