diff options
| author | Artur Signell <artur@vaadin.com> | 2015-09-01 20:49:30 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-09-01 20:49:30 +0300 |
| commit | 93cb10eb9793e1998eafab1c09a184477b3294c8 (patch) | |
| tree | b3838a4f75bcfac1e6aabdd1871341c0945638d8 | |
| parent | 3c9ec4f459408c1d927b9d7e4803c3f7ac548b29 (diff) | |
| download | vaadin-framework-93cb10eb9793e1998eafab1c09a184477b3294c8.tar.gz vaadin-framework-93cb10eb9793e1998eafab1c09a184477b3294c8.zip | |
Make responsive work in Edge (#18620)
Change-Id: Id99a1da15293768e55733787e38f090f23c2991f
| -rw-r--r-- | client/src/com/vaadin/client/extensions/ResponsiveConnector.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java b/client/src/com/vaadin/client/extensions/ResponsiveConnector.java index 621c69788c..ae330be8f4 100644 --- a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java +++ b/client/src/com/vaadin/client/extensions/ResponsiveConnector.java @@ -205,7 +205,7 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements // Get all the rulesets from the stylesheet var theRules = new Array(); - var IE = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE()(); + var IEOrEdge = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE()() || @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isEdge()(); var IE8 = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE8()(); try { @@ -263,8 +263,8 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements // Array of all of the separate selectors in this ruleset var haystack = rule.selectorText.split(","); - // IE parses CSS like .class[attr="val"] into [attr="val"].class so we need to check for both - var selectorRegEx = IE ? /\[.*\]([\.|#]\S+)/ : /([\.|#]\S+?)\[.*\]/; + // IE/Edge parses CSS like .class[attr="val"] into [attr="val"].class so we need to check for both + var selectorRegEx = IEOrEdge ? /\[.*\]([\.|#]\S+)/ : /([\.|#]\S+?)\[.*\]/; // Loop all the selectors in this ruleset for(var k = 0, len2 = haystack.length; k < len2; k++) { |