Merge branch 'master' of github.com:marcj/css-element-queries

marcj · Nov 6, 2018 · 5adf8a6 · 5adf8a6
2 parents f6144fb + da5f446
commit 5adf8a6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/ElementQueries.js b/src/ElementQueries.js
@@ -409,9 +409,11 @@
 
             document.body.addEventListener(animationStart, function (e) {
                 var element = e.target;
-                var styles = window.getComputedStyle(element, null);
+                var styles = element && window.getComputedStyle(element, null);
+                var animationName = styles && styles.getPropertyValue('animation-name');
+                var requiresSetup = animationName && (-1 !== animationName.indexOf('element-queries'));
 
-                if (-1 !== styles.getPropertyValue('animation-name').indexOf('element-queries')) {
+                if (requiresSetup) {
                     element.elementQueriesSensor = new ResizeSensor(element, function () {
                         if (element.elementQueriesSetupInformation) {
                             element.elementQueriesSetupInformation.call();