<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8772] trunk/src: Core: make sure we load minified JS and CSS when `SCRIPT_DEBUG` is set.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8772">8772</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-08-09 16:22:03 +0000 (Sat, 09 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Core: make sure we load minified JS and CSS when `SCRIPT_DEBUG` is set.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5615">#5615</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorecssjsphp">trunk/src/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#trunksrcbpcoredeprecated21php">trunk/src/bp-core/deprecated/2.1.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressfunctionsphp">trunk/src/bp-templates/bp-legacy/buddypress-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-cssjs.php (8771 => 8772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-cssjs.php 2014-08-09 15:47:17 UTC (rev 8771)
+++ trunk/src/bp-core/bp-core-cssjs.php 2014-08-09 16:22:03 UTC (rev 8772)
</span><span class="lines">@@ -15,20 +15,20 @@
</span><span class="cx"> * @since BuddyPress (2.1.0)
</span><span class="cx"> */
</span><span class="cx"> function bp_core_register_common_scripts() {
</span><del>- $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.js' : '.min.js';
</del><ins>+ $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
</ins><span class="cx"> $url = buddypress()->plugin_url . 'bp-core/js/';
</span><span class="cx">
</span><span class="cx"> $scripts = apply_filters( 'bp_core_register_common_scripts', array(
</span><span class="cx">
</span><span class="cx"> // Legacy
</span><del>- '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' ) ),
</del><ins>+ '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' ) ),
</ins><span class="cx">
</span><span class="cx"> // 2.1
</span><del>- 'jquery-caret' => array( 'file' => "{$url}jquery.caret{$ext}", 'dependencies' => array( 'jquery' ) ),
- 'jquery-atwho' => array( 'file' => "{$url}jquery.atwho{$ext}", 'dependencies' => array( 'jquery', 'jquery-caret' ) ),
</del><ins>+ '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' ) ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $version = bp_get_version();
</span></span></pre></div>
<a id="trunksrcbpcoredeprecated21php"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/deprecated/2.1.php (8771 => 8772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/deprecated/2.1.php 2014-08-09 15:47:17 UTC (rev 8771)
+++ trunk/src/bp-core/deprecated/2.1.php 2014-08-09 16:22:03 UTC (rev 8772)
</span><span class="lines">@@ -16,22 +16,41 @@
</span><span class="cx"> * @since BuddyPress (2.1.0)
</span><span class="cx"> */
</span><span class="cx"> function bp_core_register_deprecated_scripts() {
</span><del>- $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.js' : '.min.js';
</del><ins>+ $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
</ins><span class="cx"> $url = buddypress()->plugin_url . 'bp-core/deprecated/js/';
</span><span class="cx">
</span><span class="cx"> $scripts = apply_filters( 'bp_core_register_deprecated_scripts', array(
</span><ins>+
</ins><span class="cx"> // Core
</span><del>- 'bp-jquery-scroll-to' => 'jquery-scroll-to',
</del><ins>+ 'bp-jquery-scroll-to' => array(
+ 'file' => "{$url}jquery-scroll-to{$min}.js",
+ 'dependencies' => array( 'jquery' ),
+ ),
</ins><span class="cx">
</span><span class="cx"> // Messages
</span><del>- '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',
</del><ins>+ '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' ),
+ ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>- foreach ( $scripts as $id => $file ) {
- wp_register_script( $id, $url . $file . $ext, array( 'jquery' ), bp_get_version(), true );
</del><ins>+ foreach ( $scripts as $id => $script ) {
+ wp_register_script( $id, $script['file'], $script['dependencies'], bp_get_version(), true );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_enqueue_scripts', 'bp_core_register_deprecated_scripts', 1 );
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress-functions.php (8771 => 8772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2014-08-09 15:47:17 UTC (rev 8771)
+++ trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2014-08-09 16:22:03 UTC (rev 8772)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
</span><span class="cx">
</span><span class="cx"> // Locate the BP stylesheet
</span><del>- $asset = $this->locate_asset_in_stack( 'buddypress.css', 'css' );
</del><ins>+ $asset = $this->locate_asset_in_stack( "buddypress{$min}.css", 'css' );
</ins><span class="cx">
</span><span class="cx"> // Enqueue BuddyPress-specific styling, if found
</span><span class="cx"> if ( isset( $asset['location'], $asset['handle'] ) ) {
</span><span class="lines">@@ -221,11 +221,10 @@
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> */
</span><span class="cx"> public function enqueue_scripts() {
</span><ins>+ $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
</ins><span class="cx">
</span><del>- $file = 'buddypress.js';
-
</del><span class="cx"> // Locate the BP JS file
</span><del>- $asset = $this->locate_asset_in_stack( $file, 'js' );
</del><ins>+ $asset = $this->locate_asset_in_stack( "buddypress{$min}.js", 'js' );
</ins><span class="cx">
</span><span class="cx"> // Enqueue the global JS, if found - AJAX will not work
</span><span class="cx"> // without it
</span><span class="lines">@@ -259,16 +258,15 @@
</span><span class="cx">
</span><span class="cx"> // Maybe enqueue password verify JS (register page or user settings page)
</span><span class="cx"> if ( bp_is_register_page() || ( function_exists( 'bp_is_user_settings_general' ) && bp_is_user_settings_general() ) ) {
</span><del>- $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
- $filename = "password-verify{$min}.js";
</del><span class="cx">
</span><span class="cx"> // Locate the Register Page JS file
</span><del>- $asset = $this->locate_asset_in_stack( $filename, 'js' );
</del><ins>+ $asset = $this->locate_asset_in_stack( "password-verify{$min}.js", 'js' );
</ins><span class="cx">
</span><del>- // Enqueue script
</del><span class="cx"> $dependencies = array_merge( bp_core_get_js_dependencies(), array(
</span><span class="cx"> 'password-strength-meter',
</span><span class="cx"> ) );
</span><ins>+
+ // Enqueue script
</ins><span class="cx"> wp_enqueue_script( $asset['handle'] . '-password-verify', $asset['location'], $dependencies, $this->version);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>