Changeset 46357 for trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php

Timestamp:

09/30/2019 05:40:14 PM (6 years ago)

Author:

desrosj

Message:

Bundled Themes: Update Twenty Twenty.

This brings trunk’s version of Twenty Twenty in-sync with GitHub.

For a complete list of changes since [46271], see ​https://github.com/WordPress/twentytwenty/compare/932b16248...dd7032f

Props anlino, ianbelanger, nielslange, acosmin, netweb, williampatton, adhitya03, phpdocs, acalfieri, itowhid06, littlebigthing, aristath, karmatosed, poena.
See #48110.

File:

• trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php (modified) (2 diffs)

trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php

@@ -1 +1 @@
 <?php
 /**
- * Javsscript Loader Class
+ * Javascript Loader Class
  *
  * Allow `async` and `defer` while enqueuing Javascript.
  *
- * Based on a soltion in WP Rig.
+ * Based on a solution in WP Rig.
  *
  * @package WordPress
@@ -12 +12 @@
  */
 
-/**
- * A class that provides a way to add `async` or `defer` attributes to scripts.
- */
-class TwentyTwenty_Script_Loader {
+if ( ! class_exists( 'TwentyTwenty_Script_Loader' ) ) {
+    /**
+     * A class that provides a way to add `async` or `defer` attributes to scripts.
+     */
+    class TwentyTwenty_Script_Loader {
 
-    /**
-     * Adds async/defer attributes to enqueued / registered scripts.
-     *
-     * If #12009 lands in WordPress, this function can no-op since it would be handled in core.
-     *
-     * @link https://core.trac.wordpress.org/ticket/12009
-     *
-     * @param string $tag    The script tag.
-     * @param string $handle The script handle.
-     * @return string Script HTML string.
-     */
-    public function filter_script_loader_tag( $tag, $handle ) {
-        foreach ( array( 'async', 'defer' ) as $attr ) {
-            if ( ! wp_scripts()->get_data( $handle, $attr ) ) {
-                continue;
+        /**
+         * Adds async/defer attributes to enqueued / registered scripts.
+         *
+         * If #12009 lands in WordPress, this function can no-op since it would be handled in core.
+         *
+         * @link https://core.trac.wordpress.org/ticket/12009
+         *
+         * @param string $tag    The script tag.
+         * @param string $handle The script handle.
+         * @return string Script HTML string.
+         */
+        public function filter_script_loader_tag( $tag, $handle ) {
+            foreach ( [ 'async', 'defer' ] as $attr ) {
+                if ( ! wp_scripts()->get_data( $handle, $attr ) ) {
+                    continue;
+                }
+                // Prevent adding attribute when already added in #12009.
+                if ( ! preg_match( ":\s$attr(=|>|\s):", $tag ) ) {
+                    $tag = preg_replace( ':(?=></script>):', " $attr", $tag, 1 );
+                }
+                // Only allow async or defer, not both.
+                break;
             }
-            // Prevent adding attribute when already added in #12009.
-            if ( ! preg_match( ":\s$attr(=|>|\s):", $tag ) ) {
-                $tag = preg_replace( ':(?=></script>):', " $attr", $tag, 1 );
-            }
-            // Only allow async or defer, not both.
-            break;
+            return $tag;
         }
-        return $tag;
+
     }
-
 }