Fixed tests and width calculation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
parent
aea30e0004
commit
85355e98e6
|
@ -260,7 +260,7 @@
|
||||||
for (var i = 0; i < this.breadcrumbs.length; i++ ) {
|
for (var i = 0; i < this.breadcrumbs.length; i++ ) {
|
||||||
var $crumb = $(this.breadcrumbs[i]);
|
var $crumb = $(this.breadcrumbs[i]);
|
||||||
if(!$crumb.hasClass('hidden') || ignoreHidden === true) {
|
if(!$crumb.hasClass('hidden') || ignoreHidden === true) {
|
||||||
totalWidth += $crumb.width();
|
totalWidth += $crumb.outerWidth();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return totalWidth;
|
return totalWidth;
|
||||||
|
@ -329,10 +329,11 @@
|
||||||
|
|
||||||
// Used for testing since this.$el.parent fails
|
// Used for testing since this.$el.parent fails
|
||||||
if (!this.availableWidth) {
|
if (!this.availableWidth) {
|
||||||
this.usedWidth = this.$el.parent().width();
|
this.usedWidth = this.$el.parent().width() - this.$el.next('.actions').width();
|
||||||
} else {
|
} else {
|
||||||
this.usedWidth = this.availableWidth;
|
this.usedWidth = this.availableWidth;
|
||||||
}
|
}
|
||||||
|
console.log(this.usedWidth, this.getTotalWidth());
|
||||||
|
|
||||||
// If container is smaller than content
|
// If container is smaller than content
|
||||||
// AND if there are crumbs left to hide
|
// AND if there are crumbs left to hide
|
||||||
|
|
|
@ -156,7 +156,7 @@ describe('OCA.Files.BreadCrumb tests', function() {
|
||||||
onDrop: handler
|
onDrop: handler
|
||||||
});
|
});
|
||||||
bc.setDirectory('/one/two/three/four');
|
bc.setDirectory('/one/two/three/four');
|
||||||
expect(droppableStub.calledOnce).toEqual(false);
|
expect(droppableStub.calledOnce).toEqual(true);
|
||||||
|
|
||||||
expect(droppableStub.getCall(0).args[0].drop).toBeDefined();
|
expect(droppableStub.getCall(0).args[0].drop).toBeDefined();
|
||||||
// simulate drop
|
// simulate drop
|
||||||
|
|
Loading…
Reference in New Issue