FF Windows didn't like hyphenated direct access
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5a74b700 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5a74b700 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5a74b700 Branch: refs/heads/master Commit: 5a74b7001875e01aa477108cc6b5efcd6cd5b625 Parents: c4848e6 Author: Alex Harui <[email protected]> Authored: Thu Oct 1 14:54:26 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Thu Oct 1 14:54:38 2015 -0700 ---------------------------------------------------------------------- .../org/apache/flex/utils/CSSContainerUtils.js | 34 +++++++++++--------- .../flex/html/beads/layouts/HorizontalLayout.js | 4 +-- .../flex/html/beads/layouts/VerticalLayout.js | 4 +-- 3 files changed, 22 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5a74b700/frameworks/projects/Core/js/src/org/apache/flex/utils/CSSContainerUtils.js ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/js/src/org/apache/flex/utils/CSSContainerUtils.js b/frameworks/projects/Core/js/src/org/apache/flex/utils/CSSContainerUtils.js index 4ee13f8..77eee76 100644 --- a/frameworks/projects/Core/js/src/org/apache/flex/utils/CSSContainerUtils.js +++ b/frameworks/projects/Core/js/src/org/apache/flex/utils/CSSContainerUtils.js @@ -33,10 +33,11 @@ org.apache.flex.utils.CSSContainerUtils = function() { */ org.apache.flex.utils.CSSContainerUtils.getBorderMetrics = function(object) { var style = getComputedStyle(object.element); - var borderLeft = org.apache.flex.utils.CSSUtils.toNumber(style['border-left-width'], object.width); - var borderRight = org.apache.flex.utils.CSSUtils.toNumber(style['border-right-width'], object.width); - var borderTop = org.apache.flex.utils.CSSUtils.toNumber(style['border-top-width'], object.width); - var borderBottom = org.apache.flex.utils.CSSUtils.toNumber(style['border-bottom-width'], object.width); + var borderLeft = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-left-width'), object.width); + var borderRight = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-right-width'), object.width); + var borderTop = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-top-width'), object.width); + var borderBottom = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-bottom-width'), + object.width); return new org.apache.flex.geom.Rectangle(borderLeft, borderTop, borderRight - borderLeft, borderBottom - borderTop); }; @@ -48,10 +49,10 @@ org.apache.flex.utils.CSSContainerUtils.getBorderMetrics = function(object) { */ org.apache.flex.utils.CSSContainerUtils.getPaddingMetrics = function(object) { var style = getComputedStyle(object.element); - var paddingLeft = org.apache.flex.utils.CSSUtils.toNumber(style['padding-left'], object.width); - var paddingRight = org.apache.flex.utils.CSSUtils.toNumber(style['padding-right'], object.width); - var paddingTop = org.apache.flex.utils.CSSUtils.toNumber(style['padding-top'], object.width); - var paddingBottom = org.apache.flex.utils.CSSUtils.toNumber(style['padding-bottom'], object.width); + var paddingLeft = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-left'), object.width); + var paddingRight = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-right'), object.width); + var paddingTop = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-top'), object.width); + var paddingBottom = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-bottom'), object.width); return new org.apache.flex.geom.Rectangle(paddingLeft, paddingTop, paddingRight - paddingLeft, paddingBottom - paddingTop); }; @@ -64,14 +65,15 @@ org.apache.flex.utils.CSSContainerUtils.getPaddingMetrics = function(object) { */ org.apache.flex.utils.CSSContainerUtils.getBorderAndPaddingMetrics = function(object) { var style = getComputedStyle(object.element); - var borderLeft = org.apache.flex.utils.CSSUtils.toNumber(style['border-left-width'], object.width); - var borderRight = org.apache.flex.utils.CSSUtils.toNumber(style['border-right-width'], object.width); - var borderTop = org.apache.flex.utils.CSSUtils.toNumber(style['border-top-width'], object.width); - var borderBottom = org.apache.flex.utils.CSSUtils.toNumber(style['border-bottom-width'], object.width); - var paddingLeft = org.apache.flex.utils.CSSUtils.toNumber(style['padding-left'], object.width); - var paddingRight = org.apache.flex.utils.CSSUtils.toNumber(style['padding-right'], object.width); - var paddingTop = org.apache.flex.utils.CSSUtils.toNumber(style['padding-top'], object.width); - var paddingBottom = org.apache.flex.utils.CSSUtils.toNumber(style['padding-bottom'], object.width); + var borderLeft = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-left-width'), object.width); + var borderRight = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-right-width'), object.width); + var borderTop = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-top-width'), object.width); + var borderBottom = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('border-bottom-width'), + object.width); + var paddingLeft = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-left'), object.width); + var paddingRight = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-right'), object.width); + var paddingTop = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-top'), object.width); + var paddingBottom = org.apache.flex.utils.CSSUtils.toNumber(style.getPropertyValue('padding-bottom'), object.width); paddingLeft += borderLeft; paddingRight += borderRight; paddingTop += borderTop; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5a74b700/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js index 222b2e7..b5ede3d 100644 --- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js +++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js @@ -81,9 +81,9 @@ org.apache.flex.html.beads.layouts.HorizontalLayout. maxHeight = Math.max(maxHeight, child.offsetHeight); if (!hasWidth) { var cv = window.getComputedStyle(child); - var mls = cv['margin-left']; + var mls = cv.getPropertyValue('margin-left'); var ml = Number(mls.substring(0, mls.length - 2)); - var mrs = cv['margin-right']; + var mrs = cv.getPropertyValue('margin-right'); var mr = Number(mrs.substring(0, mrs.length - 2)); computedWidth += ml + child.offsetWidth + mr; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5a74b700/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js index 5627202..b179288 100644 --- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js +++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/VerticalLayout.js @@ -87,8 +87,8 @@ org.apache.flex.html.beads.layouts.VerticalLayout. child.flexjs_wrapper.dispatchEvent('sizeChanged'); } if (!hasWidth && n > 0 && !isNaN(maxWidth)) { - var pl = scv['padding-left']; - var pr = scv['padding-right']; + var pl = scv.getPropertyValue('padding-left'); + var pr = scv.getPropertyValue('padding-right'); pl = parseInt(pl.substring(0, pl.length - 2), 10); pr = parseInt(pr.substring(0, pr.length - 2), 10); maxWidth += pl + pr;
