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

Fixed tests and width calculation 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-11-08 20:12:38 +01:00
parent aea30e0004
commit 85355e98e6
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,7 @@
for (var i = 0; i < this.breadcrumbs.length; i++ ) {
var $crumb = $(this.breadcrumbs[i]);
if(!$crumb.hasClass('hidden') || ignoreHidden === true) {
totalWidth += $crumb.width();
totalWidth += $crumb.outerWidth();
}
}
return totalWidth;
@ -329,10 +329,11 @@
// Used for testing since this.$el.parent fails
if (!this.availableWidth) {
this.usedWidth = this.$el.parent().width();
this.usedWidth = this.$el.parent().width() - this.$el.next('.actions').width();
} else {
this.usedWidth = this.availableWidth;
}
console.log(this.usedWidth, this.getTotalWidth());
// If container is smaller than content
// AND if there are crumbs left to hide

2
apps/files/tests/js/breadcrumbSpec.js
View File

@ -156,7 +156,7 @@ describe('OCA.Files.BreadCrumb tests', function() {
onDrop: handler
});
bc.setDirectory('/one/two/three/four');
expect(droppableStub.calledOnce).toEqual(false);
expect(droppableStub.calledOnce).toEqual(true);
expect(droppableStub.getCall(0).args[0].drop).toBeDefined();
// simulate drop