Fixed sharing popover and removed unused old code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
parent
bce00d8b3d
commit
b44581e15d
|
@ -79,24 +79,16 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
#shareWithList .unshare img, #shareWithList .showCruds img {
|
#shareWithList .unshare img {
|
||||||
vertical-align: text-bottom; /* properly align icons */
|
vertical-align: text-bottom; /* properly align icons */
|
||||||
}
|
}
|
||||||
|
|
||||||
#shareWithList .sharingOptionsGroup .icon-more {
|
#shareWithList .sharingOptionsGroup > a .icon {
|
||||||
padding: 7px;
|
padding: 7px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
opacity: .5;
|
opacity: .5;
|
||||||
}
|
}
|
||||||
|
|
||||||
#shareWithList .unshare {
|
|
||||||
padding: 1px 6px;
|
|
||||||
vertical-align: text-bottom;
|
|
||||||
}
|
|
||||||
#shareWithList .unshare .icon {
|
|
||||||
vertical-align: text-top;
|
|
||||||
}
|
|
||||||
|
|
||||||
#shareWithList .sharingOptionsGroup .popovermenu:after {
|
#shareWithList .sharingOptionsGroup .popovermenu:after {
|
||||||
right: 3px;
|
right: 3px;
|
||||||
}
|
}
|
||||||
|
@ -122,7 +114,6 @@
|
||||||
.shareTabView .icon-loading-small {
|
.shareTabView .icon-loading-small {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
margin-right: 4px;
|
|
||||||
vertical-align: text-top;
|
vertical-align: text-top;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,6 @@
|
||||||
.popovermenu {
|
.popovermenu {
|
||||||
right: -11px;
|
right: -11px;
|
||||||
top: 35px;
|
top: 35px;
|
||||||
padding: 3px 6px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,8 +111,7 @@
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
.unshare img,
|
.unshare img {
|
||||||
.showCruds img {
|
|
||||||
vertical-align: text-bottom;
|
vertical-align: text-bottom;
|
||||||
/* properly align icons */
|
/* properly align icons */
|
||||||
}
|
}
|
||||||
|
@ -132,22 +130,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
|
||||||
&.showCruds {
|
|
||||||
display: inline;
|
|
||||||
opacity: .5;
|
|
||||||
}
|
|
||||||
&.unshare {
|
|
||||||
display: inline-block;
|
|
||||||
opacity: .5;
|
|
||||||
padding: 10px;
|
|
||||||
}
|
|
||||||
&.showCruds:hover,
|
|
||||||
&.unshare:hover {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#link {
|
#link {
|
||||||
border-top: 1px solid nc-darken($color-main-background, 14%);
|
border-top: 1px solid nc-darken($color-main-background, 14%);
|
||||||
padding-top: 8px;
|
padding-top: 8px;
|
||||||
|
|
|
@ -123,20 +123,6 @@ describe('OC.Share.ShareDialogShareeListView', function () {
|
||||||
expect(listView.$el.find("input[name='edit']").is(':checked')).toEqual(true);
|
expect(listView.$el.find("input[name='edit']").is(':checked')).toEqual(true);
|
||||||
expect(updateShareStub.calledOnce).toEqual(true);
|
expect(updateShareStub.calledOnce).toEqual(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('shows cruds checkboxes when toggled', function () {
|
|
||||||
shareModel.set('shares', [{
|
|
||||||
id: 100,
|
|
||||||
item_source: 123,
|
|
||||||
permissions: 1,
|
|
||||||
share_type: OC.Share.SHARE_TYPE_USER,
|
|
||||||
share_with: 'user1',
|
|
||||||
share_with_displayname: 'User One'
|
|
||||||
}]);
|
|
||||||
listView.render();
|
|
||||||
listView.$el.find('a.showCruds').click();
|
|
||||||
expect(listView.$el.find('li.cruds').hasClass('hidden')).toEqual(false);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue