Changeset 7604

Timestamp:

08/11/2018 10:53:13 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Plugins: After [7462], if jQuery happens to be already loaded (e.g. via a plugin on a test install), print the inline script for upload button directly.

Otherwise, keep it attached to jQuery and moved to the footer.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php

@@ -174 +174 @@
                                         </p>
                                 </form>
-                <?php
-                        wp_enqueue_script( 'jquery' );
-                        wp_add_inline_script( 'jquery-migrate', '
+
+                                <?php
+                                $upload_script = '
                                         ( function ( $ ) {
                                                 var $label = $( "label.button" ),
@@ -187 +187 @@
                                                         .on( "focus", function() { $label.addClass( "focus" ); } )
                                                         .on( "blur", function() { $label.removeClass( "focus" ); } );
-                                        } ( window.jQuery ) );' );
+                                        } ( window.jQuery ) );';
+
+                                if ( ! wp_script_is( 'jquery', 'done' ) ) {
+                                        wp_enqueue_script( 'jquery' );
+                                        wp_add_inline_script( 'jquery-migrate', $upload_script );
+                                } else {
+                                        printf( '<script>%s</script>', $upload_script );
+                                }
+                                ?>
                 
-                endif; // ! $submitted_counts->total
-
-                else : ?>
+                        <?php endif; // ! $submitted_counts->total ?>
+
+                <?php else : ?>
+
                         <p>
                         <?php