Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Fix WindowRef provider #52

Merged
merged 2 commits into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"ng2-dragula": "1.5.0"
},
"devDependencies": {
"@blackbaud/skyux": "2.38.0",
"@blackbaud/skyux-builder": "1.30.0",
"@skyux-sdk/builder-plugin-skyux": "1.0.0-rc.5"
"@blackbaud/skyux": "2.47.0",
"@blackbaud/skyux-builder": "1.33.1",
"@skyux-sdk/builder-plugin-skyux": "1.0.0"
}
}
4 changes: 1 addition & 3 deletions src/app/public/modules/grid/fixtures/grid-fixtures.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import {
} from '@angular/common';

import {
SkyUIConfigService,
SkyWindowRefService
SkyUIConfigService
} from '@skyux/core';

import {
Expand Down Expand Up @@ -57,7 +56,6 @@ import {
SkyGridModule
],
providers: [
SkyWindowRefService,
{
provide: SkyUIConfigService,
useValue: {
Expand Down
6 changes: 3 additions & 3 deletions src/app/public/modules/grid/grid.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import {
} from 'ng2-dragula/ng2-dragula';

import {
SkyWindowRefService
SkyAppWindowRef
} from '@skyux/core';

import {
Expand Down Expand Up @@ -228,7 +228,7 @@ export class SkyGridComponent implements OnInit, AfterContentInit, OnChanges, On
private dragulaService: DragulaService,
private ref: ChangeDetectorRef,
private gridAdapter: SkyGridAdapterService,
private skyWindow: SkyWindowRefService,
private skyWindow: SkyAppWindowRef,
private uiConfigService: SkyUIConfigService
) {
this.displayedColumns = new Array<SkyGridColumnModel>();
Expand Down Expand Up @@ -713,7 +713,7 @@ export class SkyGridComponent implements OnInit, AfterContentInit, OnChanges, On
}

private resetTableWidth() {
this.skyWindow.getWindow().setTimeout(() => {
this.skyWindow.nativeWindow.setTimeout(() => {
this.gridAdapter.setStyle(this.tableElementRef, 'width', `auto`);
this.ref.detectChanges();
this.tableWidth = this.tableElementRef.nativeElement.offsetWidth;
Expand Down
2 changes: 2 additions & 0 deletions src/app/public/modules/grid/grid.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
} from 'ng2-dragula/ng2-dragula';

import {
SkyAppWindowRef,
SkyUIConfigService
} from '@skyux/core';

Expand Down Expand Up @@ -64,6 +65,7 @@ import {
SkyGridCellComponent
],
providers: [
SkyAppWindowRef,
SkyUIConfigService
]
})
Expand Down