Skip to content

Commit 59c74a3

Browse files
rbrirbri
committed
time to remove IE (issue #735)
1 parent f5ec2b6 commit 59c74a3

17 files changed

Lines changed: 12 additions & 1339 deletions

‎src/main/java/org/htmlunit/WebClientOptions.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public class WebClientOptions implements Serializable {
6060

6161
private boolean geolocationEnabled_;
6262
private boolean doNotTrackEnabled_;
63-
private boolean activeXNative_;
6463
private String homePage_ = "https://www.htmlunit.org/";
6564
private ProxyConfig proxyConfig_;
6665
private int timeout_ = 90_000; // like Firefox 16 default's value for network.http.connection-timeout
@@ -510,29 +509,6 @@ public void setThrowExceptionOnScriptError(final boolean enabled) {
510509
throwExceptionOnScriptError_ = enabled;
511510
}
512511

513-
/**
514-
* Sets whether to allow native ActiveX or no. Default value is false.
515-
* Beware that you should never allow running native ActiveX components unless you fully trust
516-
* the JavaScript code, as it is not controlled by the Java Virtual Machine.
517-
*
518-
* @param allow whether to allow or no
519-
* @deprecated as of version 3.4.0
520-
*/
521-
@Deprecated
522-
public void setActiveXNative(final boolean allow) {
523-
activeXNative_ = allow;
524-
}
525-
526-
/**
527-
* Returns whether native ActiveX components are allowed or no.
528-
* @return whether native ActiveX components are allowed or no
529-
* @deprecated as of version 3.4.0
530-
*/
531-
@Deprecated
532-
public boolean isActiveXNative() {
533-
return activeXNative_;
534-
}
535-
536512
/**
537513
* Returns the client's current homepage.
538514
* @return the client's current homepage

‎src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.htmlunit.BrowserVersion;
2121
import org.htmlunit.javascript.HtmlUnitScriptable;
22-
import org.htmlunit.javascript.host.ActiveXObject;
2322
import org.htmlunit.javascript.host.AudioScheduledSourceNode;
2423
import org.htmlunit.javascript.host.BarProp;
2524
import org.htmlunit.javascript.host.BatteryManager;
@@ -42,8 +41,6 @@
4241
import org.htmlunit.javascript.host.MimeType;
4342
import org.htmlunit.javascript.host.MimeTypeArray;
4443
import org.htmlunit.javascript.host.NamedNodeMap;
45-
import org.htmlunit.javascript.host.Namespace;
46-
import org.htmlunit.javascript.host.NamespaceCollection;
4744
import org.htmlunit.javascript.host.Navigator;
4845
import org.htmlunit.javascript.host.Notification;
4946
import org.htmlunit.javascript.host.PerformanceObserver;
@@ -247,21 +244,17 @@
247244
import org.htmlunit.javascript.host.html.DataTransfer;
248245
import org.htmlunit.javascript.host.html.HTMLAllCollection;
249246
import org.htmlunit.javascript.host.html.HTMLAnchorElement;
250-
import org.htmlunit.javascript.host.html.HTMLAppletElement;
251247
import org.htmlunit.javascript.host.html.HTMLAreaElement;
252248
import org.htmlunit.javascript.host.html.HTMLAudioElement;
253249
import org.htmlunit.javascript.host.html.HTMLBGSoundElement;
254250
import org.htmlunit.javascript.host.html.HTMLBRElement;
255251
import org.htmlunit.javascript.host.html.HTMLBaseElement;
256-
import org.htmlunit.javascript.host.html.HTMLBaseFontElement;
257252
import org.htmlunit.javascript.host.html.HTMLBlockElement;
258253
import org.htmlunit.javascript.host.html.HTMLBodyElement;
259254
import org.htmlunit.javascript.host.html.HTMLButtonElement;
260255
import org.htmlunit.javascript.host.html.HTMLCanvasElement;
261256
import org.htmlunit.javascript.host.html.HTMLCollection;
262-
import org.htmlunit.javascript.host.html.HTMLDDElement;
263257
import org.htmlunit.javascript.host.html.HTMLDListElement;
264-
import org.htmlunit.javascript.host.html.HTMLDTElement;
265258
import org.htmlunit.javascript.host.html.HTMLDataElement;
266259
import org.htmlunit.javascript.host.html.HTMLDataListElement;
267260
import org.htmlunit.javascript.host.html.HTMLDetailsElement;
@@ -283,9 +276,7 @@
283276
import org.htmlunit.javascript.host.html.HTMLHtmlElement;
284277
import org.htmlunit.javascript.host.html.HTMLIFrameElement;
285278
import org.htmlunit.javascript.host.html.HTMLImageElement;
286-
import org.htmlunit.javascript.host.html.HTMLInlineQuotationElement;
287279
import org.htmlunit.javascript.host.html.HTMLInputElement;
288-
import org.htmlunit.javascript.host.html.HTMLIsIndexElement;
289280
import org.htmlunit.javascript.host.html.HTMLLIElement;
290281
import org.htmlunit.javascript.host.html.HTMLLabelElement;
291282
import org.htmlunit.javascript.host.html.HTMLLegendElement;
@@ -298,7 +289,6 @@
298289
import org.htmlunit.javascript.host.html.HTMLMetaElement;
299290
import org.htmlunit.javascript.host.html.HTMLMeterElement;
300291
import org.htmlunit.javascript.host.html.HTMLModElement;
301-
import org.htmlunit.javascript.host.html.HTMLNextIdElement;
302292
import org.htmlunit.javascript.host.html.HTMLOListElement;
303293
import org.htmlunit.javascript.host.html.HTMLObjectElement;
304294
import org.htmlunit.javascript.host.html.HTMLOptGroupElement;
@@ -322,9 +312,7 @@
322312
import org.htmlunit.javascript.host.html.HTMLTableCellElement;
323313
import org.htmlunit.javascript.host.html.HTMLTableColElement;
324314
import org.htmlunit.javascript.host.html.HTMLTableComponent;
325-
import org.htmlunit.javascript.host.html.HTMLTableDataCellElement;
326315
import org.htmlunit.javascript.host.html.HTMLTableElement;
327-
import org.htmlunit.javascript.host.html.HTMLTableHeaderCellElement;
328316
import org.htmlunit.javascript.host.html.HTMLTableRowElement;
329317
import org.htmlunit.javascript.host.html.HTMLTableSectionElement;
330318
import org.htmlunit.javascript.host.html.HTMLTemplateElement;
@@ -561,10 +549,8 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
561549

562550
@SuppressWarnings("unchecked")
563551
static final Class<? extends HtmlUnitScriptable>[] CLASSES_ = new Class[] {
564-
AbstractList.class, AbstractRange.class,
565-
ActiveXObject.class, AnalyserNode.class,
566-
Animation.class, AnimationEvent.class,
567-
Atomics.class,
552+
AbstractList.class, AbstractRange.class, AnalyserNode.class,
553+
Animation.class, AnimationEvent.class, Atomics.class,
568554
Attr.class, Audio.class, AudioBuffer.class,
569555
AudioBufferSourceNode.class, AudioContext.class, AudioDestinationNode.class, AudioListener.class,
570556
AudioNode.class, AudioParam.class, AudioProcessingEvent.class, AudioScheduledSourceNode.class,
@@ -577,8 +563,8 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
577563
CDATASection.class, ChannelMergerNode.class, ChannelSplitterNode.class, CharacterData.class, ClientRect.class,
578564
ClientRectList.class, ClipboardEvent.class,
579565
CloseEvent.class, Comment.class, CompositionEvent.class, ComputedCSSStyleDeclaration.class,
580-
ConstantSourceNode.class,
581-
ConvolverNode.class, Coordinates.class, Credential.class, CredentialsContainer.class, Crypto.class,
566+
ConstantSourceNode.class, ConvolverNode.class, Coordinates.class,
567+
Credential.class, CredentialsContainer.class, Crypto.class,
582568
CryptoKey.class, CSS.class, CSSConditionRule.class,
583569
CSSCounterStyleRule.class, CSSFontFaceRule.class, CSSGroupingRule.class, CSSImportRule.class,
584570
CSSKeyframeRule.class, CSSKeyframesRule.class, CSSMediaRule.class, CSSNamespaceRule.class, CSSPageRule.class,
@@ -601,33 +587,31 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
601587
FocusEvent.class, FontFace.class,
602588
FontFaceSet.class, FormData.class, GainNode.class, Gamepad.class,
603589
GamepadButton.class, GamepadEvent.class, Geolocation.class, HashChangeEvent.class, Headers.class, History.class,
604-
HTMLAllCollection.class,
605-
HTMLAnchorElement.class, HTMLAppletElement.class, HTMLAreaElement.class, HTMLAudioElement.class,
606-
HTMLBaseElement.class, HTMLBaseFontElement.class, HTMLBGSoundElement.class, HTMLBlockElement.class,
590+
HTMLAllCollection.class, HTMLAnchorElement.class, HTMLAreaElement.class, HTMLAudioElement.class,
591+
HTMLBaseElement.class, HTMLBGSoundElement.class, HTMLBlockElement.class,
607592
HTMLBodyElement.class, HTMLBRElement.class, HTMLButtonElement.class,
608593
HTMLCanvasElement.class, HTMLCollection.class,
609594
HTMLDataElement.class, HTMLDataListElement.class,
610-
HTMLDDElement.class, HTMLDetailsElement.class, HTMLDialogElement.class, HTMLDirectoryElement.class,
611-
HTMLDivElement.class, HTMLDListElement.class, HTMLDocument.class, HTMLDTElement.class, HTMLElement.class,
595+
HTMLDetailsElement.class, HTMLDialogElement.class, HTMLDirectoryElement.class,
596+
HTMLDivElement.class, HTMLDListElement.class, HTMLDocument.class, HTMLElement.class,
612597
HTMLEmbedElement.class, HTMLFieldSetElement.class,
613598
HTMLFontElement.class, HTMLFormControlsCollection.class, HTMLFormElement.class, HTMLFrameElement.class,
614599
HTMLFrameSetElement.class,
615600
HTMLHeadElement.class, HTMLHeadingElement.class, HTMLHRElement.class, HTMLHtmlElement.class,
616-
HTMLIFrameElement.class, HTMLImageElement.class, HTMLInlineQuotationElement.class, HTMLInputElement.class,
617-
HTMLIsIndexElement.class, HTMLLabelElement.class,
601+
HTMLIFrameElement.class, HTMLImageElement.class, HTMLInputElement.class, HTMLLabelElement.class,
618602
HTMLLegendElement.class, HTMLLIElement.class, HTMLLinkElement.class, HTMLListElement.class,
619603
HTMLMapElement.class, HTMLMarqueeElement.class,
620604
HTMLMediaElement.class, HTMLMenuElement.class, HTMLMetaElement.class,
621-
HTMLMeterElement.class, HTMLModElement.class, HTMLNextIdElement.class,
605+
HTMLMeterElement.class, HTMLModElement.class,
622606
HTMLObjectElement.class, HTMLOListElement.class, HTMLOptGroupElement.class,
623607
HTMLOptionElement.class, HTMLOptionsCollection.class, HTMLOutputElement.class,
624608
HTMLParagraphElement.class, HTMLParamElement.class, HTMLPhraseElement.class, HTMLPictureElement.class,
625609
HTMLPreElement.class, HTMLProgressElement.class, HTMLQuoteElement.class, HTMLScriptElement.class,
626610
HTMLSelectElement.class, HTMLSlotElement.class, HTMLSourceElement.class,
627611
HTMLSpanElement.class,
628612
HTMLStyleElement.class, HTMLTableCaptionElement.class, HTMLTableCellElement.class, HTMLTableColElement.class,
629-
HTMLTableComponent.class, HTMLTableDataCellElement.class, HTMLTableElement.class,
630-
HTMLTableHeaderCellElement.class, HTMLTableRowElement.class, HTMLTableSectionElement.class,
613+
HTMLTableComponent.class, HTMLTableElement.class,
614+
HTMLTableRowElement.class, HTMLTableSectionElement.class,
631615
HTMLTemplateElement.class, HTMLTextAreaElement.class, HTMLTimeElement.class,
632616
HTMLTitleElement.class, HTMLTrackElement.class, HTMLUListElement.class, HTMLUnknownElement.class,
633617
HTMLVideoElement.class,
@@ -650,7 +634,6 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
650634
MIDIInputMap.class, MIDIMessageEvent.class, MIDIOutput.class, MIDIOutputMap.class, MIDIPort.class,
651635
MimeType.class, MimeTypeArray.class, MouseEvent.class, MouseScrollEvent.class,
652636
MutationEvent.class, MutationObserver.class, MutationRecord.class, NamedNodeMap.class,
653-
Namespace.class, NamespaceCollection.class,
654637
Navigator.class, NetworkInformation.class, Node.class, NodeFilter.class, NodeIterator.class,
655638
NodeList.class, Notification.class,
656639
OfflineAudioCompletionEvent.class,

‎src/main/java/org/htmlunit/javascript/host/ActiveXObject.java‎

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)