Changeset 8091

Timestamp:

03/09/2014 02:53:15 PM (11 years ago)

Author:

boonebgorges

Message:

Move .confirm javascript to a separate, properly enqueued file

This improves our compliance with WP standards, improves our integration with
caching systems, and allows plugins to manage the conditional loading of
scripts.

Fixes #5209

Location:

trunk/bp-core

Files:

• bp-core-cssjs.php (modified) (1 diff)
• js/confirm.js (added)
• js/confirm.min.js (added)

trunk/bp-core/bp-core-cssjs.php

@@ -14 +14 @@
  */
 function bp_core_confirmation_js() {
+    if ( is_multisite() && ! bp_is_root_blog() ) {
+        return false;
+    }
 
-    if ( is_multisite() && ! bp_is_root_blog() )
-        return false;
+    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+    wp_enqueue_script( 'bp-confirm', buddypress()->plugin_url . "bp-core/js/confirm{$min}.js", array( 'jquery' ), bp_get_version() );
 
-    if ( !wp_script_is( 'jquery' ) )
-        wp_enqueue_script( 'jquery' );
+    wp_localize_script( 'bp-confirm', 'BP_Confirm', array(
+        'are_you_sure' => __( 'Are you sure?', 'buddypress' ),
+    ) );
 
-    if ( !wp_script_is( 'jquery', 'done' ) )
-        wp_print_scripts( 'jquery' ); ?>
-
-    <script type="text/javascript">
-        jQuery( document ).ready( function() {
-            jQuery( 'a.confirm').click( function() {
-                if ( confirm( '<?php _e( 'Are you sure?', 'buddypress' ) ?>' ) )
-                    return true; else return false;
-            });
-        });
-    </script>
-
-<?php
 }
-add_action( 'wp_head',    'bp_core_confirmation_js', 100 );
-add_action( 'admin_head', 'bp_core_confirmation_js', 100 );
+add_action( 'wp_enqueue_scripts',    'bp_core_confirmation_js' );
+add_action( 'admin_enqueue_scripts', 'bp_core_confirmation_js' );
 
 /**