Changeset 8772

Timestamp:

08/09/2014 04:22:03 PM (11 years ago)

Author:

djpaul

Message:

Core: make sure we load minified JS and CSS when SCRIPT_DEBUG is set.

Fixes #5615

Location:

trunk/src

Files:

• bp-core/bp-core-cssjs.php (modified) (2 diffs)
• bp-core/deprecated/2.1.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (3 diffs)

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

@@ -16 +16 @@
  */
 function bp_core_register_common_scripts() {
-    $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.js' : '.min.js';
+    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
     $url = buddypress()->plugin_url . 'bp-core/js/';
     
@@ -22 +22 @@
 
         // Legacy
-        'bp-confirm'        => array( 'file' => "{$url}confirm{$ext}",        'dependencies' => array( 'jquery' ) ),
-        'bp-widget-members' => array( 'file' => "{$url}widget-members{$ext}", 'dependencies' => array( 'jquery' ) ),
-        'bp-jquery-query'   => array( 'file' => "{$url}jquery-query{$ext}",   'dependencies' => array( 'jquery' ) ),
-        'bp-jquery-cookie'  => array( 'file' => "{$url}jquery-cookie{$ext}",  'dependencies' => array( 'jquery' ) ),
+        'bp-confirm'        => array( 'file' => "{$url}confirm{$min}.js",        'dependencies' => array( 'jquery' ) ),
+        'bp-widget-members' => array( 'file' => "{$url}widget-members{$min}.js", 'dependencies' => array( 'jquery' ) ),
+        'bp-jquery-query'   => array( 'file' => "{$url}jquery-query{$min}.js",   'dependencies' => array( 'jquery' ) ),
+        'bp-jquery-cookie'  => array( 'file' => "{$url}jquery-cookie{$min}.js",  'dependencies' => array( 'jquery' ) ),
 
         // 2.1
-        'jquery-caret' => array( 'file' => "{$url}jquery.caret{$ext}", 'dependencies' => array( 'jquery' ) ),
-        'jquery-atwho' => array( 'file' => "{$url}jquery.atwho{$ext}", 'dependencies' => array( 'jquery', 'jquery-caret' ) ),
+        'jquery-caret' => array( 'file' => "{$url}jquery.caret{$min}.js", 'dependencies' => array( 'jquery' ) ),
+        'jquery-atwho' => array( 'file' => "{$url}jquery.atwho{$min}.js", 'dependencies' => array( 'jquery', 'jquery-caret' ) ),
     ) );
 

trunk/src/bp-core/deprecated/2.1.php

@@ -17 +17 @@
  */
 function bp_core_register_deprecated_scripts() {
-    $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.js' : '.min.js';
+    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
     $url = buddypress()->plugin_url . 'bp-core/deprecated/js/';
 
     $scripts = apply_filters( 'bp_core_register_deprecated_scripts', array(
+
         // Core
-        'bp-jquery-scroll-to' => 'jquery-scroll-to',
+        'bp-jquery-scroll-to' => array(
+            'file'         => "{$url}jquery-scroll-to{$min}.js",
+            'dependencies' => array( 'jquery' ),
+        ),
 
         // Messages
-        'bp-jquery-autocomplete'    => 'autocomplete/jquery.autocomplete',
-        'bp-jquery-autocomplete-fb' => 'autocomplete/jquery.autocompletefb',
-        'bp-jquery-bgiframe'        => 'autocomplete/jquery.bgiframe',
-        'bp-jquery-dimensions'      => 'autocomplete/jquery.dimensions',
+        'bp-jquery-autocomplete'    => array(
+            'file'          => "{$url}autocomplete/jquery.autocomplete{$min}.js",
+            'dependencies' => array( 'jquery' ),
+        ),
+
+        'bp-jquery-autocomplete-fb' => array(
+            'file'         => "{$url}autocomplete/jquery.autocompletefb{$min}.js",
+            'dependencies' => array( 'jquery' ),
+        ),
+
+        'bp-jquery-bgiframe' => array(
+            'file'         => "{$url}autocomplete/jquery.bgiframe{$min}.js",
+            'dependencies' => array( 'jquery' ),
+        ),
+
+        'bp-jquery-dimensions' => array(
+            'file'         => "{$url}autocomplete/jquery.dimensions{$min}.js",
+            'dependencies' => array( 'jquery' ),
+        ),
     ) );
 
-    foreach ( $scripts as $id => $file ) {
-        wp_register_script( $id, $url . $file . $ext, array( 'jquery' ), bp_get_version(), true );
+    foreach ( $scripts as $id => $script ) {
+        wp_register_script( $id, $script['file'], $script['dependencies'], bp_get_version(), true );
     }
 }

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -203 +203 @@
 
         // Locate the BP stylesheet
-        $asset = $this->locate_asset_in_stack( 'buddypress.css', 'css' );
+        $asset = $this->locate_asset_in_stack( "buddypress{$min}.css", 'css' );
 
         // Enqueue BuddyPress-specific styling, if found
@@ -222 +222 @@
      */
     public function enqueue_scripts() {
-
-        $file = 'buddypress.js';
+        $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
         // Locate the BP JS file
-        $asset = $this->locate_asset_in_stack( $file, 'js' );
+        $asset = $this->locate_asset_in_stack( "buddypress{$min}.js", 'js' );
 
         // Enqueue the global JS, if found - AJAX will not work
@@ -260 +259 @@
         // Maybe enqueue password verify JS (register page or user settings page)
         if ( bp_is_register_page() || ( function_exists( 'bp_is_user_settings_general' ) && bp_is_user_settings_general() ) ) {
-            $min      = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-            $filename = "password-verify{$min}.js";
 
             // Locate the Register Page JS file
-            $asset = $this->locate_asset_in_stack( $filename, 'js' );
-
-            // Enqueue script
+            $asset = $this->locate_asset_in_stack( "password-verify{$min}.js", 'js' );
+
             $dependencies = array_merge( bp_core_get_js_dependencies(), array(
                 'password-strength-meter',
             ) );
+
+            // Enqueue script
             wp_enqueue_script( $asset['handle'] . '-password-verify', $asset['location'], $dependencies, $this->version);
         }