From c1f2d67df5786b276b6e553c3a3b4804dc8c0942 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 8 May 2018 19:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8A=A0=E7=B2=97?= =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=E7=BA=BF=E5=90=8C=E6=97=B6=E4=BD=9C?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E4=B8=80=E6=AE=B5=E6=96=87=E5=AD=97=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E7=9B=B4=E6=8E=A5=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _src/core/domUtils.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/_src/core/domUtils.js b/_src/core/domUtils.js index ff74e69c7..be7423d59 100644 --- a/_src/core/domUtils.js +++ b/_src/core/domUtils.js @@ -1622,14 +1622,18 @@ var domUtils = (dom.domUtils = { try { var value = domUtils.getStyle(element, styleName) || - (window.getComputedStyle + browser.webkit && styleName === 'text-decoration' ? domUtils .getWindow(element) - .getComputedStyle(element, "") - .getPropertyValue(styleName) - : (element.currentStyle || element.style)[ - utils.cssStyleToDomStyle(styleName) - ]); + .getComputedStyle(element)['webkitTextDecorationsInEffect'] + : (window.getComputedStyle + ? domUtils + .getWindow(element) + .getComputedStyle(element, "") + .getPropertyValue(styleName) + : (element.currentStyle || element.style)[ + utils.cssStyleToDomStyle(styleName) + ]); } catch (e) { return ""; }