minor Closure poking

GoogleChromeLabs · May 6, 2020 · d393ec3 · d393ec3
1 parent cf0fc80
commit d393ec3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -26,7 +26,7 @@
   <link rel="manifest" href="./manifest.json" />
   <meta name="theme-color" content="blue" />
   <meta name="theme-color" content="red" />
-  <script src="../src/pwacompat.js"></script>
+  <script src="../pwacompat.min.js"></script>
 </head>
 <body>
 

diff --git a/pwacompat.min.js b/pwacompat.min.js
diff --git a/src/pwacompat.js b/src/pwacompat.js
@@ -64,7 +64,13 @@ function unused() {
    * @return {?Element}
    */
   function getElementInHead(selector) {
-    return document.head.querySelector(selector);
+    // It's possible to pass "bad" attr or values here (originally from the manifest); just
+    // return null if there's something wrong.
+    try {
+      return document.head.querySelector(selector);
+    } catch (e) {
+      return null;
+    }
   }
 
   /**
@@ -83,10 +89,6 @@ function unused() {
    * @return {boolean}
    */
   function isLinkPresent(attr, value) {
-    if (/["\\]/.test(value)) {
-      // This should practically never happen. Don't allow quotes or escapes here.
-      return false;
-    }
     return Boolean(getElementInHead('link[' + attr + '="' + value + '"]'));
   }
 
@@ -202,7 +204,7 @@ function unused() {
       }
       return parseInt(size, 10) || 0; // NaN is falsey
     });
-    return Math.max(...sizes);
+    return Math.max.apply(null, sizes); // don't use ... as Closure inserts additional code
   }
 
   /**
@@ -516,7 +518,9 @@ function unused() {
       if (!t) {
         return;  // something went wrong, we had a UWP without titleBar
       }
-      t.foregroundColor = colorToWindowsRGBA(themeIsLight ? 'black' : 'white');
+      // Foreground is black if theme is light, otherwise white.
+      const v = themeIsLight ? 255 : 0;
+      t.foregroundColor = /** @type {WindowsColor} */ ({'r': v, 'g': v, 'b': v, 'a': 255});
       t.backgroundColor = colorToWindowsRGBA(color);
     }
   }