1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00

Fix modal-body div missing #583 (#585)

* Fix modal-body div missing #583

* Revert "Fix modal-body div missing #583"

This reverts commit 38f0cae82dae229cf929a52ba8d2d622b9449f72.

* Fixing modal-body div missing #583
This commit is contained in:
Chad Scharf 2020-07-28 09:55:59 -04:00 committed by GitHub
parent 59d5a7439d
commit 2e01ff7826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -85,7 +85,7 @@ export class CollectionsComponent implements OnInit {
} }
loadMore() { loadMore() {
if (this.collections.length <= this.pageSize) { if (!this.collections || this.collections.length <= this.pageSize) {
return; return;
} }
const pagedLength = this.pagedCollections.length; const pagedLength = this.pagedCollections.length;
@ -185,7 +185,7 @@ export class CollectionsComponent implements OnInit {
if (searching && this.didScroll) { if (searching && this.didScroll) {
this.resetPaging(); this.resetPaging();
} }
return !searching && this.collections.length > this.pageSize; return !searching && this.collections && this.collections.length > this.pageSize;
} }
private removeCollection(collection: CollectionView) { private removeCollection(collection: CollectionView) {

View File

@ -81,7 +81,7 @@ export class GroupsComponent implements OnInit {
} }
loadMore() { loadMore() {
if (this.groups.length <= this.pageSize) { if (!this.groups || this.groups.length <= this.pageSize) {
return; return;
} }
const pagedLength = this.pagedGroups.length; const pagedLength = this.pagedGroups.length;
@ -179,7 +179,7 @@ export class GroupsComponent implements OnInit {
if (searching && this.didScroll) { if (searching && this.didScroll) {
this.resetPaging(); this.resetPaging();
} }
return !searching && this.groups.length > this.pageSize; return !searching && this.groups && this.groups.length > this.pageSize;
} }
private removeGroup(group: GroupResponse) { private removeGroup(group: GroupResponse) {

View File

@ -129,7 +129,7 @@ export class PeopleComponent implements OnInit {
} }
loadMore() { loadMore() {
if (this.users.length <= this.pageSize) { if (!this.users || this.users.length <= this.pageSize) {
return; return;
} }
const pagedLength = this.pagedUsers.length; const pagedLength = this.pagedUsers.length;
@ -331,7 +331,7 @@ export class PeopleComponent implements OnInit {
if (searching && this.didScroll) { if (searching && this.didScroll) {
this.resetPaging(); this.resetPaging();
} }
return !searching && this.users.length > this.pageSize; return !searching && this.users && this.users.length > this.pageSize;
} }
private async doConfirmation(user: OrganizationUserUserDetailsResponse) { private async doConfirmation(user: OrganizationUserUserDetailsResponse) {