Skip to content

Commit 22678dc

Browse files
Fix icon imports and MS Edge (#93)
1 parent ef9291f commit 22678dc

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

src/app-initialize.ts

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,38 @@ import { IonicConfig } from '@ionic/core';
44

55
// Webpack import for ionicons
66
import { addIcons } from 'ionicons';
7-
import { ICON_PATHS } from 'ionicons/icons';
7+
import { arrowBack, arrowDown, arrowForward, close, closeCircle, menu, reorder, search } from 'ionicons/icons';
88

9-
import { defineCustomElements } from '@ionic/core/loader';
9+
import { applyPolyfills, defineCustomElements } from '@ionic/core/loader';
1010
import { IonicWindow } from './interfaces';
1111

1212
export function appInitialize(config?: IonicConfig) {
1313
const win: IonicWindow = window as any;
1414
const Ionic = (win.Ionic = win.Ionic || {});
1515

1616
Ionic.config = config;
17-
defineCustomElements(window);
18-
addIcons(ICON_PATHS);
17+
// defineCustomElements(window);
18+
// addIcons(ICON_PATHS);
19+
addIcons({
20+
'ios-close': close.ios,
21+
'md-close': close.md,
22+
'ios-reorder': reorder.ios,
23+
'md-reorder': reorder.md,
24+
'ios-menu': menu.ios,
25+
'md-menu': menu.md,
26+
'ios-arrow-forward': arrowForward.ios,
27+
'md-arrow-forward': arrowForward.md,
28+
'ios-arrow-back': arrowBack.ios,
29+
'md-arrow-back': arrowBack.md,
30+
'ios-arrow-down': arrowDown.ios,
31+
'md-arrow-down': arrowDown.md,
32+
'ios-search': search.ios,
33+
'md-search': search.md,
34+
'ios-close-circle': closeCircle.ios,
35+
'md-close-circle': closeCircle.md,
36+
});
37+
38+
return applyPolyfills().then(() => {
39+
return defineCustomElements(win);
40+
});
1941
}

src/util.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { HTMLStencilElement } from '@ionic/core';
2+
13
export class OverlayBaseController<Opts, Overlay> {
24
constructor(private ctrl: string) {}
35

types/app-initialize.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import { IonicConfig } from '@ionic/core';
2-
export declare function appInitialize(config?: IonicConfig): void;
2+
export declare function appInitialize(config?: IonicConfig): Promise<void>;
33
//# sourceMappingURL=app-initialize.d.ts.map

types/util.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { HTMLStencilElement } from '@ionic/core';
12
export declare class OverlayBaseController<Opts, Overlay> {
23
private ctrl;
34
constructor(ctrl: string);

0 commit comments

Comments
 (0)