Skip to content

Commit

Permalink
Remove IE8-IE10 client side code
Browse files Browse the repository at this point in the history
Change-Id: I2ca0b41c3cc2ed851646ced2e0693a93b1853c95
  • Loading branch information
Artur- authored and Vaadin Code Review committed Aug 18, 2016
1 parent c9f9534 commit 0081286
Show file tree
Hide file tree
Showing 84 changed files with 159 additions and 1,496 deletions.
4 changes: 4 additions & 0 deletions client/src/main/java/com/vaadin/client/BrowserInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,17 @@ public boolean isSafari() {
return browserDetails.isSafari();
}

@Deprecated
public boolean isIE8() {
return isIE() && getBrowserMajorVersion() == 8;
}

@Deprecated
public boolean isIE9() {
return isIE() && getBrowserMajorVersion() == 9;
}

@Deprecated
public boolean isIE10() {
return isIE() && getBrowserMajorVersion() == 10;
}
Expand Down Expand Up @@ -517,3 +520,4 @@ public boolean isBrowserVersionNewerOrEqual(int majorVersion,
return (getBrowserMajorVersion() > majorVersion);
}
}

24 changes: 8 additions & 16 deletions client/src/main/java/com/vaadin/client/LayoutManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ private boolean needsMeasureForManagedLayout(ComponentConnector connector) {
}

/**
* Assigns a measured size to an element. Method defined as protected to
* allow separate implementation for IE8.
* Assigns a measured size to an element. Method defined as protected for
* legacy reasons.
*
* @param element
* the dom element to attach the measured size to
Expand All @@ -182,8 +182,8 @@ protected native void setMeasuredSize(Element element,
}-*/;

/**
* Gets the measured size for an element. Method defined as protected to
* allow separate implementation for IE8.
* Gets the measured size for an element. Method defined as protected for
* legacy reasons.
*
* @param element
* The element to get measured size for
Expand Down Expand Up @@ -281,8 +281,8 @@ public void layoutNow() {

/**
* Called once per iteration in the layout loop before size calculations so
* different browsers quirks can be handled. Mainly this is currently for
* the IE8 permutation.
* different browsers quirks can be handled. Mainly this exists for legacy
* reasons.
*/
protected void performBrowserLayoutHacks() {
// Permutations implement this
Expand Down Expand Up @@ -600,8 +600,6 @@ private void doLayout() {
}
Profiler.leave("layout PostLayoutListener");

cleanMeasuredSizes();

getLogger().info("Total layout phase time: "
+ totalDuration.elapsedMillis() + "ms");
}
Expand Down Expand Up @@ -800,8 +798,7 @@ private void onConnectorChange(ComponentConnector connector,

private void setNeedsOverflowFix(ComponentConnector connector) {
// IE9 doesn't need the original fix, but for some reason it needs this
if (BrowserInfo.get().requiresOverflowAutoFix()
|| BrowserInfo.get().isIE9()) {
if (BrowserInfo.get().requiresOverflowAutoFix()) {
ComponentConnector scrollingBoundary = currentDependencyTree
.getScrollingBoundary(connector);
if (scrollingBoundary != null) {
Expand Down Expand Up @@ -1822,12 +1819,6 @@ public void setEverythingNeedsMeasure() {
everythingNeedsMeasure = true;
}

/**
* Clean measured sizes which are no longer needed. Only for IE8.
*/
public void cleanMeasuredSizes() {
}

private static Logger getLogger() {
return Logger.getLogger(LayoutManager.class.getName());
}
Expand Down Expand Up @@ -1855,3 +1846,4 @@ public boolean isLayoutNeeded() {
return false;
}
}

115 changes: 0 additions & 115 deletions client/src/main/java/com/vaadin/client/LayoutManagerIE8.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static MouseEventDetails buildMouseEventDetails(NativeEvent evt,
} else if (evt.getButton() == NativeEvent.BUTTON_MIDDLE) {
mouseEventDetails.setButton(MouseButton.MIDDLE);
} else {
// IE8 does not always report a button. Assume left.
// No button reported? Assume left.
mouseEventDetails.setButton(MouseButton.LEFT);
}
mouseEventDetails.setAltKey(evt.getAltKey());
Expand Down Expand Up @@ -94,3 +94,4 @@ private static int getRelativeY(int clientY, Element target) {
}

}

17 changes: 1 addition & 16 deletions client/src/main/java/com/vaadin/client/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -669,22 +669,6 @@ public static void forceWebkitRedraw(Element element) {
WidgetUtil.forceWebkitRedraw(element);
}

/**
* Performs a hack to trigger a re-layout in the IE8. This is usually
* necessary in cases where IE8 "forgets" to update child elements when they
* resize.
*
* @deprecated As of 7.4.0, use {@link WidgetUtil#forceIE8Redraw(Element)}
* instead.
*
* @param e
* The element to perform the hack on
*/
@Deprecated
public static final void forceIE8Redraw(Element e) {
WidgetUtil.forceIE8Redraw(e);
}

/**
* Performs a hack to trigger a re-layout in the IE browser. This is usually
* necessary in cases where IE "forgets" to update child elements when they
Expand Down Expand Up @@ -1276,3 +1260,4 @@ private static Logger getLogger() {
return Logger.getLogger(Util.class.getName());
}
}

3 changes: 1 addition & 2 deletions client/src/main/java/com/vaadin/client/VTooltip.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,13 @@ public class VTooltip extends VOverlay {
* @see ApplicationConnection#getVTooltip()
*/
public VTooltip() {
super(false, false, true);
super(false, false); // no autohide, not modal
setStyleName(CLASSNAME);
FlowPanel layout = new FlowPanel();
setWidget(layout);
layout.add(em);
DOM.setElementProperty(description, "className", CLASSNAME + "-text");
DOM.appendChild(layout.getElement(), description);
setSinkShadowEvents(true);

// When a tooltip is shown, the content of the tooltip changes. With a
// tooltip being a live-area, this change is notified to a assistive
Expand Down
Loading

0 comments on commit 0081286

Please sign in to comment.