Skip to content

Commit 544e304

Browse files
committed
fix body/frameset
1 parent 544d5a0 commit 544e304

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

baselines/dom.generated.d.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5468,13 +5468,8 @@ declare var HTMLBaseFontElement: {
54685468
new(): HTMLBaseFontElement;
54695469
};
54705470

5471-
interface HTMLBodyElementEventMap extends ElementEventMap, GlobalEventHandlersEventMap, DocumentAndElementEventHandlersEventMap, WindowEventHandlersEventMap {
5472-
"blur": FocusEvent;
5473-
"error": ErrorEvent;
5474-
"focus": FocusEvent;
5475-
"load": Event;
5471+
interface HTMLBodyElementEventMap extends HTMLElementEventMap, WindowEventHandlersEventMap {
54765472
"orientationchange": Event;
5477-
"scroll": UIEvent;
54785473
}
54795474

54805475
interface HTMLBodyElement extends HTMLElement, WindowEventHandlers {
@@ -6058,7 +6053,7 @@ declare var HTMLFrameElement: {
60586053
new(): HTMLFrameElement;
60596054
};
60606055

6061-
interface HTMLFrameSetElementEventMap extends ElementEventMap, GlobalEventHandlersEventMap, DocumentAndElementEventHandlersEventMap, WindowEventHandlersEventMap {
6056+
interface HTMLFrameSetElementEventMap extends HTMLElementEventMap, WindowEventHandlersEventMap {
60626057
}
60636058

60646059
interface HTMLFrameSetElement extends HTMLElement, WindowEventHandlers {

inputfiles/removedTypes.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@
6161
"HTMLBodyElement": {
6262
"properties": {
6363
"property": {
64-
"onresize": null
64+
"onblur": null,
65+
"onerror": null,
66+
"onfocus": null,
67+
"onload": null,
68+
"onresize": null,
69+
"onscroll": null
6570
}
6671
}
6772
},

src/emitter.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
187187
}
188188
else if (e.deprecated) {
189189
htmlDeprecatedResult[e.name] = i.name;
190-
}
190+
}
191191
else {
192192
htmlResult[e.name] = i.name;
193193
}
@@ -210,16 +210,20 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
210210

211211
function getParentsWithEventHandler(i: Browser.Interface) {
212212
function getParentEventHandler(i: Browser.Interface): Browser.Interface[] {
213-
return iNameToEhList[i.name] && iNameToEhList[i.name].length ? [i] : getParentsWithEventHandler(i);
213+
const hasEventListener = iNameToEhList[i.name] && iNameToEhList[i.name].length;
214+
if (hasEventListener) {
215+
return [i];
216+
}
217+
const ehParents = getParentsWithEventHandler(i);
218+
if (ehParents.length > 1) {
219+
return [i];
220+
}
221+
return ehParents;
214222
}
215223

216224
const extendedParentWithEventHandler = allInterfacesMap[i.extends] && getParentEventHandler(allInterfacesMap[i.extends]) || [];
217225
const implementedParentsWithEventHandler = i.implements ? flatMap(i.implements, i => getParentEventHandler(allInterfacesMap[i])) : [];
218226

219-
if (extendedParentWithEventHandler.length > 1 && implementedParentsWithEventHandler.length === 0) {
220-
return [allInterfacesMap[i.extends]];
221-
}
222-
223227
return distinct(extendedParentWithEventHandler.concat(implementedParentsWithEventHandler));
224228
}
225229

@@ -1083,7 +1087,7 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
10831087
const iterableGetter = findIterableGetter();
10841088
const lengthProperty = findLengthProperty(i) || findLengthProperty(allInterfacesMap[i.extends]);
10851089
if (iterableGetter && lengthProperty) {
1086-
return [convertDomTypeToTsType({
1090+
return [convertDomTypeToTsType({
10871091
type: iterableGetter.signature[0].type,
10881092
"override-type": iterableGetter.signature[0]["override-type"]
10891093
})];
@@ -1124,7 +1128,7 @@ export function emitWebIDl(webidl: Browser.WebIdl, flavor: Flavor) {
11241128
if (comments && comments[m.name]) {
11251129
printer.printLine(comments[m.name]);
11261130
}
1127-
printer.printLine(`${ m.name }(): ${ m.definition };`);
1131+
printer.printLine(`${m.name}(): ${m.definition};`);
11281132
});
11291133
}
11301134

0 commit comments

Comments
 (0)