Skip to content

Commit 5851870

Browse files
authored
Merge pull request #210 from cal-smith/tooltip-ie
fix(dialog): fix dialog in IE11
2 parents e03194f + 5b5e9dd commit 5851870

File tree

4 files changed

+49
-5
lines changed

4 files changed

+49
-5
lines changed

.storybook/addons.js

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
import '@storybook/addon-actions/register';
2-
import '@storybook/addon-links/register';
3-
import '@storybook/addon-notes/register';
4-
import '@storybook/addon-knobs/register'
1+
import "core-js/es6/symbol";
2+
import "core-js/es6/object";
3+
import "core-js/es6/function";
4+
import "core-js/es6/parse-int";
5+
import "core-js/es6/parse-float";
6+
import "core-js/es6/number";
7+
import "core-js/es6/math";
8+
import "core-js/es6/string";
9+
import "core-js/es6/date";
10+
import "core-js/es6/array";
11+
import "core-js/es6/regexp";
12+
import "core-js/es6/map";
13+
import "core-js/es6/set";
14+
import "core-js/es6/reflect";
15+
16+
import "core-js/es7/reflect";
17+
import "zone.js/dist/zone";
18+
19+
import "@storybook/addon-actions/register";
20+
import "@storybook/addon-links/register";
21+
import "@storybook/addon-notes/register";
22+
import "@storybook/addon-knobs/register";

.storybook/config.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
import "core-js/es6/symbol";
2+
import "core-js/es6/object";
3+
import "core-js/es6/function";
4+
import "core-js/es6/parse-int";
5+
import "core-js/es6/parse-float";
6+
import "core-js/es6/number";
7+
import "core-js/es6/math";
8+
import "core-js/es6/string";
9+
import "core-js/es6/date";
10+
import "core-js/es6/array";
11+
import "core-js/es6/regexp";
12+
import "core-js/es6/map";
13+
import "core-js/es6/set";
14+
import "core-js/es6/reflect";
15+
16+
import "core-js/es7/reflect";
17+
import "zone.js/dist/zone";
18+
119
import { configure } from "@storybook/angular";
220

321
// load global styles

src/dialog/dialog.component.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,14 @@ export class Dialog implements OnInit, AfterViewInit, OnDestroy {
137137
*/
138138
ngAfterViewInit() {
139139
const dialogElement = this.dialog.nativeElement;
140-
dialogElement.classList = `${dialogElement.classList} ${this.dialogConfig.wrapperClass}`;
140+
// split the wrapper class list and apply separately to avoid IE from
141+
// 1. throwing an error due to assigning a readonly property (classList)
142+
// 2. throwing a SyntaxError due to passing an empty string to `add`
143+
if (this.dialogConfig.wrapperClass) {
144+
for (const extraClass of this.dialogConfig.wrapperClass.split(" ")) {
145+
dialogElement.classList.add(extraClass);
146+
}
147+
}
141148
this.placeDialog();
142149
dialogElement.focus();
143150
const parentEl: HTMLElement = this.dialogConfig.parentRef.nativeElement;

src/dialog/tooltip/tooltip.stories.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ storiesOf("Tooltip", module)
4040
style="cursor: pointer;">
4141
Click for tooltip
4242
</span>
43+
<ibm-placeholder></ibm-placeholder>
4344
`
4445
}));

0 commit comments

Comments
 (0)