Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit a92c616

Browse files
NielsLeenheerNielsLeenheer
authored
Merge pull request #521 from dstorey/remove-deprecated-features
Remove deprecated features and fix test
2 parents f1430fb + f2e7b4f commit a92c616

File tree

2 files changed

+2
-219
lines changed

2 files changed

+2
-219
lines changed

‎scripts/9/data.js

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -257,22 +257,6 @@ var tests = [
257257
urls: [
258258
[ 'whatwg', 'https://html.spec.whatwg.org/multipage/forms.html#the-summary-element' ]
259259
]
260-
}, {
261-
id: 'menutoolbar',
262-
name: '<code>menu</code> element of type <code>toolbar</code>',
263-
status: 'proposal',
264-
value: { maximum: 1, award: { OLD: 0 } },
265-
urls: [
266-
[ 'whatwg', 'https://html.spec.whatwg.org/multipage/forms.html#the-menu-element' ]
267-
]
268-
}, {
269-
id: 'menucontext',
270-
name: '<code>menu</code> element of type <code>context</code>',
271-
status: 'proposal',
272-
value: { maximum: 2, award: { OLD: 1 } },
273-
urls: [
274-
[ 'whatwg', 'https://html.spec.whatwg.org/multipage/forms.html#the-menu-element' ]
275-
]
276260
}, {
277261
id: 'dialog',
278262
name: '<code>dialog</code> element',
@@ -778,12 +762,6 @@ var tests = [
778762
name: '<code>files</code> property',
779763
value: 1,
780764
url: 'http://www.w3.org/TR/html5/forms.html#dom-input-files'
781-
}, {
782-
id: 'directory',
783-
status: 'experimental',
784-
name: 'Directory upload support',
785-
value: 1,
786-
url: 'https://wicg.github.io/directory-upload/proposal.html'
787765
}
788766
]
789767
}, {
@@ -2462,7 +2440,7 @@ var tests = [
24622440
]
24632441
},
24642442

2465-
'<strong>Content and Scheme handlers</strong>',
2443+
'<strong>Scheme handlers</strong>',
24662444

24672445
{
24682446
id: 'registerProtocolHandler',
@@ -2472,14 +2450,6 @@ var tests = [
24722450
[ 'w3c', 'http://www.w3.org/TR/html5/webappapis.html#custom-handlers' ],
24732451
[ 'mdn', '/Web-based_protocol_handlers' ]
24742452
]
2475-
}, {
2476-
id: 'registerContentHandler',
2477-
name: 'Custom content handlers',
2478-
value: 1,
2479-
urls: [
2480-
[ 'w3c', 'http://www.w3.org/TR/html5/webappapis.html#custom-handlers' ],
2481-
[ 'mdn', '/Web/API/Navigator/registerContentHandler' ]
2482-
]
24832453
}
24842454
]
24852455
}, {

‎scripts/9/engine.js

Lines changed: 1 addition & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -475,177 +475,6 @@ Test9 = (function () {
475475
});
476476
},
477477

478-
479-
/* menu toolbar */
480-
481-
function (results) {
482-
var passed = legacy = false;
483-
484-
try {
485-
var element = document.createElement('menu');
486-
document.body.appendChild(element);
487-
488-
try {
489-
legacy = typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && 'type' in element;
490-
} catch (error) {
491-
}
492-
493-
// Check default type
494-
if (legacy && element.type != 'list') legacy = false;
495-
496-
// Check type sanitization
497-
try {
498-
element.type = 'foobar';
499-
} catch (error) {
500-
}
501-
502-
if (legacy && element.type == 'foobar') legacy = false;
503-
504-
// Check if correct type sticks
505-
try {
506-
element.type = 'list';
507-
} catch (error) {
508-
legacy = false;
509-
}
510-
511-
if (legacy && element.type != 'list') legacy = false;
512-
513-
document.body.removeChild(element);
514-
} catch (error) {
515-
}
516-
517-
try {
518-
var element = document.createElement('menu');
519-
document.body.appendChild(element);
520-
521-
try {
522-
passed = typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && 'type' in element;
523-
} catch (error) {
524-
}
525-
526-
// Check default type
527-
if (passed && element.type != 'toolbar') passed = false;
528-
529-
// Check type sanitization
530-
try {
531-
element.type = 'foobar';
532-
} catch (error) {
533-
}
534-
535-
if (passed && element.type == 'foobar') passed = false;
536-
537-
// Check if correct type sticks
538-
try {
539-
element.type = 'toolbar';
540-
} catch (error) {
541-
passed = false;
542-
}
543-
544-
if (passed && element.type != 'toolbar') passed = false;
545-
546-
document.body.removeChild(element);
547-
} catch (error) {
548-
}
549-
550-
results.addItem({
551-
key: 'elements.interactive.menutoolbar',
552-
passed: passed ? YES : legacy ? YES | OLD : NO
553-
});
554-
},
555-
556-
557-
/* menu context */
558-
559-
function (results) {
560-
var passed = legacy = false;
561-
562-
try {
563-
var element = document.createElement('menu');
564-
document.body.appendChild(element);
565-
566-
try {
567-
legacy = typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && 'type' in element;
568-
} catch (error) {
569-
}
570-
571-
// Check if correct type sticks
572-
try {
573-
element.type = 'popup';
574-
} catch (error) {
575-
legacy = false;
576-
}
577-
578-
if (legacy && element.type != 'popup') legacy = false;
579-
580-
581-
if (legacy) {
582-
var item = document.createElement('menuitem');
583-
element.appendChild(item);
584-
585-
if (typeof HTMLMenuItemElement == 'undefined' || !item instanceof HTMLMenuItemElement) legacy = false;
586-
}
587-
588-
document.body.removeChild(element);
589-
} catch (error) {
590-
}
591-
592-
try {
593-
var element = document.createElement('menu');
594-
document.body.appendChild(element);
595-
596-
try {
597-
passed = typeof HTMLMenuElement != 'undefined' && element instanceof HTMLMenuElement && 'type' in element;
598-
} catch (error) {
599-
}
600-
601-
try {
602-
element.type = 'context';
603-
} catch (error) {
604-
}
605-
606-
// Check default type
607-
var second = document.createElement('menu');
608-
element.appendChild(second);
609-
if (passed && second.type == 'list') legacy = true;
610-
if (passed && second.type != 'context') passed = false;
611-
element.removeChild(second);
612-
613-
// Check type sanitization
614-
try {
615-
element.type = 'foobar';
616-
} catch (error) {
617-
}
618-
619-
if (passed && element.type == 'foobar') passed = false;
620-
621-
// Check if correct type sticks
622-
try {
623-
element.type = 'context';
624-
} catch (error) {
625-
passed = false;
626-
}
627-
628-
if (passed && element.type != 'context') passed = false;
629-
630-
631-
if (passed) {
632-
var item = document.createElement('menuitem');
633-
element.appendChild(item);
634-
635-
if (typeof HTMLMenuItemElement == 'undefined' || !item instanceof HTMLMenuItemElement) passed = false;
636-
}
637-
638-
document.body.removeChild(element);
639-
} catch (error) {
640-
}
641-
642-
results.addItem({
643-
key: 'elements.interactive.menucontext',
644-
passed: passed ? YES : legacy ? YES | OLD : NO
645-
});
646-
},
647-
648-
649478
/* dialog element */
650479

651480
function (results) {
@@ -1030,11 +859,6 @@ Test9 = (function () {
1030859
key: 'form.file.files',
1031860
passed: element.files && element.files instanceof FileList
1032861
});
1033-
1034-
results.addItem({
1035-
key: 'form.file.directory',
1036-
passed: 'directory' in element && window.Directory
1037-
});
1038862
},
1039863

1040864

@@ -1658,7 +1482,7 @@ Test9 = (function () {
16581482
function (results) {
16591483
results.addItem({
16601484
key: 'media.getDisplayMedia',
1661-
passed: !!navigator.mediaDevices && !!navigator.mediaDevices.getDisplayMedia ? YES : NO
1485+
passed: !!navigator.getDisplayMedia || (!!navigator.mediaDevices && !!navigator.mediaDevices.getDisplayMedia) ? YES : NO
16621486
});
16631487
},
16641488

@@ -3483,17 +3307,6 @@ Test9 = (function () {
34833307
});
34843308
},
34853309

3486-
3487-
/* registerContentHandler */
3488-
3489-
function (results) {
3490-
results.addItem({
3491-
key: 'offline.registerContentHandler',
3492-
passed: !!window.navigator.registerContentHandler
3493-
});
3494-
},
3495-
3496-
34973310
/* session storage */
34983311

34993312
function (results) {

0 commit comments

Comments
 (0)