ishida83 · February 9, 2020 07:49 · May 3, 2017 · May 3, 2017 · May 3, 2017 · May 3, 2017
diff --git a/safari-nomodule.js b/safari-nomodule.js
@@ -17,16 +17,17 @@
   if (!('noModule' in check) && 'onbeforeload' in check) {
     var support = false;
     document.addEventListener('beforeload', function(e) {
-      if (e.target.type === 'module') {
+      if (e.target === check) {
         support = true;
-      } else if (e.target.hasAttribute('nomodule') && support) {
-        e.preventDefault();
+      } else if (!e.target.hasAttribute('nomodule') || !support) {
+        return;
       }
+      e.preventDefault();
     }, true);
 
     check.type = 'module';
-    check.src = URL.createObjectURL(new Blob([], {type: 'text/javascript'}));
+    check.src = '.';
     document.head.appendChild(check);
-    document.head.removeChild(check);
+    check.remove();
   }
 }());
diff --git a/safari-nomodule.min.js b/safari-nomodule.min.js
@@ -7,16 +7,17 @@
   if (!('noModule' in c) && 'onbeforeload' in c) {
     var s = false;
     d.addEventListener('beforeload', function(e) {
-      if (e.target.type === 'module') {
+      if (e.target === c) {
         s = true;
-      } else if (e.target.hasAttribute('nomodule') && s) {
-        e.preventDefault();
+      } else if (!e.target.hasAttribute('nomodule') || !s) {
+        return;
       }
+      e.preventDefault();
     }, true);
 
     c.type = 'module';
-    c.src = URL.createObjectURL(new Blob([], {type: 'text/javascript'}));
+    c.src = '.';
     d.head.appendChild(c);
-    d.head.removeChild(c);
+    c.remove();
   }
 }());
diff --git a/safari-nomodule.js b/safari-nomodule.js
@@ -1,22 +1,32 @@
 /**
  * Safari 10.1 supports modules, but does not support the `nomodule` attribute - it will
- * load <script nomodule> anyway. This snippet of code corrects tags like-
- *   <script type="module" src="..."></script><!-- will load -->
- *   <script nomodule src="..."></script>     <!-- will not load -->
- * (i.e., both tags must have a src="..." attribute).
+ * load <script nomodule> anyway. This snippet solve this problem, but only for script
+ * tags that load external code, e.g.: <script nomodule src="nomodule.js"></script>
  *
- * This works because Safari supports the non-standard 'beforeload' event. This allows us
- * to trap the module and nomodule load.
+ * Again: this will **not** prevent inline script, e.g.:
+ * <script nomodule>alert('no modules');</script>.
+ *
+ * This workaround is possible because Safari supports the non-standard 'beforeload' event.
+ * This allows us to trap the module and nomodule load.
+ *
+ * Note also that `nomodule` is supported in later versions of Safari - it's just 10.1 that
+ * omits this attribute.
  */
 (function() {
-  if (!('noModule' in document.currentScript)) {
+  var check = document.createElement('script');
+  if (!('noModule' in check) && 'onbeforeload' in check) {
     var support = false;
-    document.addEventListener('beforeload', function(ev) {
-      if (ev.target.type === 'module') {
+    document.addEventListener('beforeload', function(e) {
+      if (e.target.type === 'module') {
         support = true;
-      } else if (ev.target.hasAttribute('nomodule') && support) {
-        ev.preventDefault();
+      } else if (e.target.hasAttribute('nomodule') && support) {
+        e.preventDefault();
       }
     }, true);
+
+    check.type = 'module';
+    check.src = URL.createObjectURL(new Blob([], {type: 'text/javascript'}));
+    document.head.appendChild(check);
+    document.head.removeChild(check);
   }
 }());
diff --git a/safari-nomodule-ext.js → safari-nomodule.min.js b/safari-nomodule-ext.js → safari-nomodule.min.js
@@ -1,11 +1,10 @@
 /**
- * Simpler version of above that does not require <script type="module"> *before* a
- * <script nomodule>.
+ * Minified-ish version of the above.
  */
 (function() {
   var d = document;
   var c = d.createElement('script');
-  if (!('noModule' in c)) {
+  if (!('noModule' in c) && 'onbeforeload' in c) {
     var s = false;
     d.addEventListener('beforeload', function(e) {
       if (e.target.type === 'module') {

diff --git a/safari-nomodule-ext.js b/safari-nomodule-ext.js
@@ -17,7 +17,7 @@
 
     c.type = 'module';
     c.src = URL.createObjectURL(new Blob([], {type: 'text/javascript'}));
-    d.head.appendChild(check);
-    d.head.removeChild(check);
+    d.head.appendChild(c);
+    d.head.removeChild(c);
   }
 }());
diff --git a/safari-nomodule-ext.js b/safari-nomodule-ext.js
@@ -0,0 +1,23 @@
+/**
+ * Simpler version of above that does not require <script type="module"> *before* a
+ * <script nomodule>.
+ */
+(function() {
+  var d = document;
+  var c = d.createElement('script');
+  if (!('noModule' in c)) {
+    var s = false;
+    d.addEventListener('beforeload', function(e) {
+      if (e.target.type === 'module') {
+        s = true;
+      } else if (e.target.hasAttribute('nomodule') && s) {
+        e.preventDefault();
+      }
+    }, true);
+
+    c.type = 'module';
+    c.src = URL.createObjectURL(new Blob([], {type: 'text/javascript'}));
+    d.head.appendChild(check);
+    d.head.removeChild(check);
+  }
+}());
diff --git a/safari-nomodule.js b/safari-nomodule.js
@@ -0,0 +1,22 @@
+/**
+ * Safari 10.1 supports modules, but does not support the `nomodule` attribute - it will
+ * load <script nomodule> anyway. This snippet of code corrects tags like-
+ *   <script type="module" src="..."></script><!-- will load -->
+ *   <script nomodule src="..."></script>     <!-- will not load -->
+ * (i.e., both tags must have a src="..." attribute).
+ *
+ * This works because Safari supports the non-standard 'beforeload' event. This allows us
+ * to trap the module and nomodule load.
+ */
+(function() {
+  if (!('noModule' in document.currentScript)) {
+    var support = false;
+    document.addEventListener('beforeload', function(ev) {
+      if (ev.target.type === 'module') {
+        support = true;
+      } else if (ev.target.hasAttribute('nomodule') && support) {
+        ev.preventDefault();
+      }
+    }, true);
+  }
+}());