Skip to content

Commit

Permalink
Use icon-more in breadcrumb for unshared folders instead of icon-share,
Browse files Browse the repository at this point in the history
fix #3564

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
  • Loading branch information
jancborchardt authored and rullzer committed Sep 18, 2017
1 parent bdba987 commit 6106ab2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion apps/files_sharing/css/sharebreadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
*/

div.crumb span.icon-shared,
div.crumb span.icon-public {
div.crumb span.icon-public,
div.crumb span.icon-more {
display: inline-block;
cursor: pointer;
opacity: 0.2;
Expand Down
6 changes: 3 additions & 3 deletions apps/files_sharing/js/sharebreadcrumbview.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

if (this._dirInfo !== null && (this._dirInfo.path !== '/' || this._dirInfo.name !== '')) {
var isShared = data.dirInfo && data.dirInfo.shareTypes && data.dirInfo.shareTypes.length > 0;
this.$el.removeClass('shared icon-public icon-shared');
this.$el.removeClass('shared icon-public icon-shared icon-more');
if (isShared) {
this.$el.addClass('shared');
if (data.dirInfo.shareTypes.indexOf(OC.Share.SHARE_TYPE_LINK) !== -1) {
Expand All @@ -53,12 +53,12 @@
this.$el.addClass('icon-shared');
}
} else {
this.$el.addClass('icon-shared');
this.$el.addClass('icon-more');
}
this.$el.show();
this.delegateEvents();
} else {
this.$el.removeClass('shared icon-public icon-shared');
this.$el.removeClass('shared icon-public icon-shared icon-more');
this.$el.hide();
}

Expand Down

0 comments on commit 6106ab2

Please sign in to comment.