From a0c8b50ef05a961f1a944c2ee5bc1d6d5237dddb Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 10 Dec 2013 17:21:29 -0800
Subject: [PATCH] CRM-13929 - Use minified js conditionally based on debug mode

---
 CRM/Core/Resources.php | 59 ++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 33a6cecf01..557f0dbf9c 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -539,50 +539,53 @@ class CRM_Core_Resources {
    * @return array
    */
   static function coreResourceList() {
-    $items = array(
-      'packages/jquery/jquery-1.10.2.min.js',
-      'packages/jquery/jquery-migrate-1.2.1.js',
-      'packages/jquery/jquery-ui-1.9.0/js/jquery-ui-1.9.0.custom.min.js',
-      'packages/jquery/jquery-ui-1.9.0/css/smoothness/jquery-ui-1.9.0.custom.min.css',
+    // Use minified javascript for production, uncompressed in debug mode
+    $min = CRM_Core_Config::singleton()->debug ? '' : '.min';
 
-      'packages/jquery/plugins/jquery.autocomplete.js',
-      'packages/jquery/css/jquery.autocomplete.css',
+    $items = array(
+      "packages/jquery/jquery-1.10.2.min.js",
+      "packages/jquery/jquery-migrate-1.2.1.js",
+      "packages/jquery/jquery-ui-1.9.0/js/jquery-ui-1.9.0.custom.min.js",
+      "packages/jquery/jquery-ui-1.9.0/css/smoothness/jquery-ui-1.9.0.custom.min.css",
+        
+      "packages/jquery/plugins/jquery.autocomplete.js",
+      "packages/jquery/css/jquery.autocomplete.css",
 
-      'packages/jquery/plugins/jquery.menu.pack.js',
-      'packages/jquery/css/menu.css',
+      "packages/jquery/plugins/jquery.menu.pack.js",
+      "packages/jquery/css/menu.css",
 
-      'packages/jquery/plugins/jquery.tableHeader.js',
+      "packages/jquery/plugins/jquery.tableHeader.js",
 
-      'packages/jquery/plugins/jquery.textarearesizer.js',
+      "packages/jquery/plugins/jquery.textarearesizer.js",
 
-      'packages/jquery/plugins/jquery.form.js',
+      "packages/jquery/plugins/jquery.form$min.js",
 
-      'packages/jquery/plugins/jquery.tokeninput.js',
-      'packages/jquery/css/token-input-facebook.css',
+      "packages/jquery/plugins/jquery.tokeninput.js",
+      "packages/jquery/css/token-input-facebook.css",
 
-      'packages/jquery/plugins/jquery.timeentry.min.js',
+      "packages/jquery/plugins/jquery.timeentry$min.js",
 
-      'packages/jquery/plugins/DataTables/media/css/demo_table_jui.css',
-      'packages/jquery/plugins/DataTables/media/js/jquery.dataTables.min.js',
+      "packages/jquery/plugins/DataTables/media/css/demo_table_jui.css",
+      "packages/jquery/plugins/DataTables/media/js/jquery.dataTables$min.js",
 
-      'packages/jquery/plugins/jquery.FormNavigate.js',
+      "packages/jquery/plugins/jquery.FormNavigate.js",
 
-      'packages/jquery/plugins/jquery.validate.min.js',
-      'packages/jquery/plugins/jquery.ui.datepicker.validation.pack.js',
+      "packages/jquery/plugins/jquery.validate$min.js",
+      "packages/jquery/plugins/jquery.ui.datepicker.validation.pack.js",
 
-      'packages/jquery/plugins/jquery.jeditable.mini.js',
+      "packages/jquery/plugins/jquery.jeditable.mini.js",
 
-      'packages/jquery/plugins/jquery.blockUI.js',
+      "packages/jquery/plugins/jquery.blockUI.js",
 
-      'packages/jquery/plugins/jquery.notify.min.js',
+      "packages/jquery/plugins/jquery.notify$min.js",
 
-      'packages/jquery/plugins/jquery.redirect.min.js',
+      "packages/jquery/plugins/jquery.redirect.min.js",
 
-      'js/rest.js',
-      'js/Common.js',
+      "js/rest.js",
+      "js/Common.js",
 
-      'js/jquery/jquery.crmeditable.js',
-      'js/jquery/jquery.crmasmselect.js',
+      "js/jquery/jquery.crmeditable.js",
+      "js/jquery/jquery.crmasmselect.js",
     );
     return $items;
   }
-- 
2.25.1