Changeset 21592 for trunk/wp-includes/script-loader.php

Timestamp:

08/23/2012 12:04:18 AM (9 years ago)

Author:

nacin

Message:

Switch to .min for compressed JS and CSS files.

• This moves our "development" versions from .dev.js to .js (same for css).
• The compressed version then moves from .js to .min.js (same for css).

By switching to the standard .min convention, it sets expectations for developers,
and works nicely with existing tools such as ack.

fixes #21633.

File:

• trunk/wp-includes/script-loader.php (modified) (4 diffs)

trunk/wp-includes/script-loader.php

@@ -58 +58 @@
     $scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
 
-    $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
+    $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
     $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js" );
@@ -461 +461 @@
     $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
 
-    $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
-
-    $rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'wplink', 'customize-controls' );
-    // Any rtl stylesheets that don't have a .dev version for ltr
+    $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+
+    $rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls' );
+    // Any rtl stylesheets that don't have a .min version
     $no_suffix = array( 'farbtastic' );
 
@@ -507 +507 @@
  */
 function wp_prototype_before_jquery( $js_array ) {
+    if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
+        return $js_array;
+
     if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
-        return $js_array;
-
-    if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
         return $js_array;
 
@@ -576 +576 @@
 
         if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG )
-            $url = preg_replace('/.css$|.css(?=\?)/', '.dev.css', $url);
+            $url = preg_replace( '/.min.css$|.min.css(?=\?)/', '.css', $url );
 
         if ( isset($parsed['query']) && $parsed['query'] ) {