Fix for issue #971; simplifies several conditional expressions into || operators. Patch by: fredsa Review by: scottb git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@989 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImpl.java b/user/src/com/google/gwt/user/client/impl/DOMImpl.java index e103e68..542cb3c 100644 --- a/user/src/com/google/gwt/user/client/impl/DOMImpl.java +++ b/user/src/com/google/gwt/user/client/impl/DOMImpl.java
@@ -68,13 +68,13 @@ }-*/; public native Element eventGetFromElement(Event evt) /*-{ - return evt.fromElement ? evt.fromElement : null; + return evt.fromElement || null; }-*/; public native int eventGetKeyCode(Event evt) /*-{ // 'which' gives the right key value, except when it doesn't -- in which // case, keyCode gives the right value on all browsers. - return evt.which ? evt.which : evt.keyCode; + return evt.which || evt.keyCode; }-*/; public abstract int eventGetMouseWheelVelocityY(Event evt); @@ -166,7 +166,7 @@ public native Element getElementById(String id) /*-{ var elem = $doc.getElementById(id); - return elem ? elem : null; + return elem || null; }-*/; public native String getElementProperty(Element elem, String prop) /*-{ @@ -187,7 +187,7 @@ }-*/; public native int getEventsSunk(Element elem) /*-{ - return elem.__eventBits ? elem.__eventBits : 0; + return elem.__eventBits || 0; }-*/; public abstract Element getFirstChild(Element elem);
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImplIE6.java b/user/src/com/google/gwt/user/client/impl/DOMImplIE6.java index e0a3edf..4fd4a2f 100644 --- a/user/src/com/google/gwt/user/client/impl/DOMImplIE6.java +++ b/user/src/com/google/gwt/user/client/impl/DOMImplIE6.java
@@ -41,12 +41,11 @@ }-*/; public native Element eventGetTarget(Event evt) /*-{ - var elem = evt.srcElement; - return elem ? elem : null; + return evt.srcElement || null; }-*/; public native Element eventGetToElement(Event evt) /*-{ - return evt.toElement ? evt.toElement : null; + return evt.toElement || null; }-*/; public native void eventPreventDefault(Event evt) /*-{ @@ -80,7 +79,7 @@ public native Element getChild(Element elem, int index) /*-{ var child = elem.children[index]; - return child ? child : null; + return child || null; }-*/; public native int getChildCount(Element elem) /*-{ @@ -98,7 +97,7 @@ public native Element getFirstChild(Element elem) /*-{ var child = elem.firstChild; - return child ? child : null; + return child || null; }-*/; public native String getInnerText(Element elem) /*-{ @@ -108,12 +107,12 @@ public native Element getNextSibling(Element elem) /*-{ var sib = elem.nextSibling; - return sib ? sib : null; + return sib || null; }-*/; public native Element getParent(Element elem) /*-{ var parent = elem.parentElement; - return parent ? parent : null; + return parent || null; }-*/; public native String iframeGetSrc(Element elem) /*-{
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java b/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java index 5242540..f66e9e1 100644 --- a/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java +++ b/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java
@@ -37,12 +37,12 @@ }-*/; public native Element eventGetTarget(Event evt) /*-{ - return evt.target ? evt.target : null; + return evt.target || null; }-*/; public native Element eventGetToElement(Event evt) /*-{ // Standard browsers use relatedTarget rather than toElement. - return evt.relatedTarget ? evt.relatedTarget : null; + return evt.relatedTarget || null; }-*/; public native void eventPreventDefault(Event evt) /*-{ @@ -95,14 +95,14 @@ var child = elem.firstChild; while (child && child.nodeType != 1) child = child.nextSibling; - return child ? child : null; + return child || null; }-*/; public native Element getNextSibling(Element elem) /*-{ var sib = elem.nextSibling; while (sib && sib.nodeType != 1) sib = sib.nextSibling; - return sib ? sib : null; + return sib || null; }-*/; public native Element getParent(Element elem) /*-{ @@ -112,7 +112,7 @@ } if (parent.nodeType != 1) parent = null; - return parent ? parent : null; + return parent || null; }-*/; public native String iframeGetSrc(Element elem) /*-{