Avoid uncaught exception in iframe if WebNFC is not supported

Part of #11269.
web-platform-tests · May 31, 2018 · 872ff88 · 872ff88
1 parent 730415d
commit 872ff88
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/web-nfc/nfc_push.https.html b/web-nfc/nfc_push.https.html
@@ -137,21 +137,25 @@
 promise_test(() => {
   return new Promise((resolve,reject) => {
     let iframe = document.createElement('iframe');
-    iframe.srcdoc = '<script>' +
-                    '  window.onmessage = message => {' +
-                    '    if (message.data === "Ready") {' +
-                    '      let onSuccess = () => { parent.postMessage("Failure", "*"); };' +
-                    '      let onError = error => {' +
-                    '        if (error.name == "SecurityError") {' +
-                    '          parent.postMessage("Success", "*");' +
-                    '        } else {' +
-                    '          parent.postMessage("Failure", "*");' +
-                    '        }' +
-                    '      };' +
-                    '      navigator.nfc.push("Test").then(onSuccess, onError);' +
-                    '    }' +
-                    '  };' +
-                    '<\/script>';
+    iframe.srcdoc = `<script>
+                      window.onmessage = message => {
+                        if (message.data === "Ready") {
+                          let onSuccess = () => { parent.postMessage("Failure", "*"); };
+                          let onError = error => {
+                            if (error.name == "SecurityError") {
+                              parent.postMessage("Success", "*");
+                            } else {
+                              parent.postMessage("Failure", "*");
+                            }
+                          };
+                          try {
+                            navigator.nfc.push("Test").then(onSuccess, onError);
+                          } catch(e) {
+                            parent.postMessage("Failure", "*");
+                          }
+                        }
+                      };
+                    <\/script>`;
     iframe.onload = () => iframe.contentWindow.postMessage('Ready', '*');
     document.body.appendChild(iframe);
     window.onmessage = message => {