Changeset 6862 for trunk/src/templates/default/bbpress-functions.php

Timestamp:

09/05/2018 06:55:06 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat: introduce bbp_locate_enqueueable() and bbp_urlize_enqueueable().

These functions are used to help make locating enqueueable assets easier, and use bbp_locate_template() interntally, now accepting an array of files.

In addition, bbp_locate_enqueueable() also internally juggles minimized file variations, and stacks them according to the SCRIPT_DEBUG constant. This ensures that both minimized and unminimized file variants are in the array in the preferred order.

This fixes a regression between bbPress 2.5 and 2.6 caused by the bundling of minimized assets in theme compatibility, and ensures that sites with their own bbpress.css files in their own locations will continue to get loaded, regardless of the SCRIPT_DEBUG setting.

Fixes #3218.

File:

• trunk/src/templates/default/bbpress-functions.php (modified) (13 diffs)

trunk/src/templates/default/bbpress-functions.php

@@ -41 +41 @@
      *
      * @since 2.1.0 bbPress (r3732)
-     *
      */
     public function __construct( $properties = array() ) {
@@ -62 +61 @@
      *
      * @access private
-     *
      */
     private function setup_actions() {
@@ -118 +116 @@
      *
      * @since 2.1.0 bbPress (r3732)
-     *
      */
     public function enqueue_styles() {
@@ -124 +121 @@
         // RTL and/or minified
         $suffix  = is_rtl() ? '-rtl' : '';
-        $suffix .= defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
         // Get and filter the bbp-default style
         $styles = apply_filters( 'bbp_default_styles', array(
             'bbp-default' => array(
-                'file'         => 'css/bbpress' . $suffix . '.css',
+                'file'         => 'css/bbpress.css',
                 'dependencies' => array()
             )
@@ -144 +140 @@
      *
      * @since 2.1.0 bbPress (r3732)
-     *
      */
     public function enqueue_scripts() {
@@ -150 +145 @@
         // Setup scripts array
         $scripts = array();
-
-        // Minified
-        $suffix  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
         // Editor scripts
@@ -158 +150 @@
         if ( bbp_use_wp_editor() && is_bbpress() ) {
             $scripts['bbpress-editor'] = array(
-                'file'         => 'js/editor' . $suffix . '.js',
+                'file'         => 'js/editor.js',
                 'dependencies' => array( 'jquery' )
             );
@@ -166 +158 @@
         if ( bbp_is_single_forum() ) {
             $scripts['bbpress-engagements'] = array(
-                'file'         => 'js/engagements' . $suffix . '.js',
+                'file'         => 'js/engagements.js',
                 'dependencies' => array( 'jquery' )
             );
@@ -176 +168 @@
             // Engagements
             $scripts['bbpress-engagements'] = array(
-                'file'         => 'js/engagements' . $suffix . '.js',
+                'file'         => 'js/engagements.js',
                 'dependencies' => array( 'jquery' )
             );
@@ -183 +175 @@
             if ( bbp_thread_replies() ) {
                 $scripts['bbpress-reply'] = array(
-                    'file'         => 'js/reply' . $suffix . '.js',
+                    'file'         => 'js/reply.js',
                     'dependencies' => array( 'jquery' )
                 );
@@ -209 +201 @@
      *
      * @since 2.1.0 bbPress (r3732)
-     *
      */
     public function localize_topic_script() {
@@ -227 +218 @@
      *
      * @since 2.1.0 bbPress (r3732)
-     *
      */
     public function ajax_favorite() {
@@ -291 +281 @@
      *
      * @since 2.1.0 bbPress (r3732)
-     *
      */
     public function ajax_subscription() {