aboutsummaryrefslogtreecommitdiffstats
path: root/client/src/com
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-07-07 21:21:58 +0300
committerVaadin Code Review <review@vaadin.com>2015-07-11 13:26:31 +0000
commit16a00beddef02cdc37bbeb41f34a3e3d2edf17bc (patch)
tree5e79bb09a65fcbab37d2181e93a98793aa45b0cf /client/src/com
parent84daff0e39ca19d73255b60b0737742c3706dbfa (diff)
downloadvaadin-framework-16a00beddef02cdc37bbeb41f34a3e3d2edf17bc.tar.gz
vaadin-framework-16a00beddef02cdc37bbeb41f34a3e3d2edf17bc.zip
Log exception from responsive with cross site css in FF (#16249)
Change-Id: I6072429d3a87afd25a6dd6604749ace728ab6d7d
Diffstat (limited to 'client/src/com')
-rw-r--r--client/src/com/vaadin/client/extensions/ResponsiveConnector.java19
1 files changed, 15 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java b/client/src/com/vaadin/client/extensions/ResponsiveConnector.java
index 2e1e75f6cd..621c69788c 100644
--- a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java
+++ b/client/src/com/vaadin/client/extensions/ResponsiveConnector.java
@@ -84,6 +84,10 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
getLogger().log(Level.SEVERE, message);
}
+ private static void warning(String message) {
+ getLogger().warning(message);
+ }
+
@Override
protected void extend(ServerConnector target) {
this.target = (AbstractComponentConnector) target;
@@ -204,10 +208,17 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
var IE = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE()();
var IE8 = @com.vaadin.client.BrowserInfo::get()().@com.vaadin.client.BrowserInfo::isIE8()();
- if (sheet.cssRules) {
- theRules = sheet.cssRules
- } else if (sheet.rules) {
- theRules = sheet.rules
+ try {
+ if (sheet.cssRules) {
+ theRules = sheet.cssRules
+ } else if (sheet.rules) {
+ theRules = sheet.rules
+ }
+ } catch (e) {
+ // FF spews if trying to access rules for cross domain styles
+ @ResponsiveConnector::warning(*)("Can't process styles from " + sheet.href +
+ ", probably because of cross domain issues: " + e);
+ return;
}
// Special import handling for IE8