[HtmlUnit] SVN: [12413] trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/ javascript/host/css/ComputedCSSStyleDeclaration.java

[<asa...@us...>]

Revision: 12413
          http://sourceforge.net/p/htmlunit/code/12413
Author:   asashour
Date:     2016-04-13 14:42:09 +0000 (Wed, 13 Apr 2016)
Log Message:
-----------
Fixing build

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java	2016-04-13 12:18:40 UTC (rev 12412)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java	2016-04-13 14:42:09 UTC (rev 12413)
@@ -696,6 +696,10 @@
      */
     @Override
     public String getMarginLeft() {
+        final String superMarginLeft = super.getMarginLeft();
+        if (!superMarginLeft.endsWith("%")) {
+            return pixelString(defaultIfEmpty(superMarginLeft, "0px"));
+        }
         final Element elem = getElement();
         if (!elem.getDomNodeOrDie().isAttachedToPage()) {
             if (getBrowserVersion().hasFeature(CSS_COMPUTED_NO_Z_INDEX)) {
@@ -720,6 +724,10 @@
      */
     @Override
     public String getMarginRight() {
+        final String superMarginRight = super.getMarginRight();
+        if (!superMarginRight.endsWith("%")) {
+            return pixelString(defaultIfEmpty(superMarginRight, "0px"));
+        }
         final Element elem = getElement();
         if (!elem.getDomNodeOrDie().isAttachedToPage()) {
             if (getBrowserVersion().hasFeature(CSS_COMPUTED_NO_Z_INDEX)) {