Merge pull request #4 from prebid/prebid-5.0

Prebid 5.0
patmmccann · Apr 14, 2021 · 6c0e714 · 6c0e714
2 parents 07742da + 91edf7f
commit 6c0e714
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 892 deletions.
diff --git a/modules/zemantaBidAdapter.js b/modules/zemantaBidAdapter.js
diff --git a/modules/zemantaBidAdapter.md b/modules/zemantaBidAdapter.md
diff --git a/src/sizeMapping.js b/src/sizeMapping.js
@@ -121,22 +121,17 @@ function evaluateSizeConfig(configs) {
   return configs.reduce((results, config) => {
     if (
       typeof config === 'object' &&
-      typeof config.mediaQuery === 'string'
+      typeof config.mediaQuery === 'string' &&
+      config.mediaQuery.length > 0
     ) {
       let ruleMatch = false;
 
-      // TODO: (Prebid - 4.0) Remove empty mediaQuery string check. Disallow empty mediaQuery in sizeConfig.
-      // Refer: https://github.com/prebid/Prebid.js/pull/4691, https://github.com/prebid/Prebid.js/issues/4810 for more details.
-      if (config.mediaQuery === '') {
-        ruleMatch = true;
-      } else {
-        try {
-          ruleMatch = getWindowTop().matchMedia(config.mediaQuery).matches;
-        } catch (e) {
-          logWarn('Unfriendly iFrame blocks sizeConfig from being correctly evaluated');
-
-          ruleMatch = matchMedia(config.mediaQuery).matches;
-        }
+      try {
+        ruleMatch = getWindowTop().matchMedia(config.mediaQuery).matches;
+      } catch (e) {
+        logWarn('Unfriendly iFrame blocks sizeConfig from being correctly evaluated');
+
+        ruleMatch = matchMedia(config.mediaQuery).matches;
       }
 
       if (ruleMatch) {