From 84c40a732e8d33a8518e5c63c8fbd2fae60fc667 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 2 Apr 2012 12:07:59 -0700 Subject: [PATCH] Minor, don't minify raphael.js since it doesn't survive it Auditors: btrahan --- externals/raphael/g.raphael.js | 1 + externals/raphael/g.raphael.line.js | 1 + externals/raphael/raphael.js | 1 + src/__celerity_resource_map__.php | 6 +++--- .../celerity/controller/CelerityResourceController.php | 6 ++++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/externals/raphael/g.raphael.js b/externals/raphael/g.raphael.js index be2c5509c8..676f60860a 100644 --- a/externals/raphael/g.raphael.js +++ b/externals/raphael/g.raphael.js @@ -1,5 +1,6 @@ /** * @provides raphael-g + * @do-not-minify */ /*! * g.Raphael 0.5 - Charting library, based on Raphaël diff --git a/externals/raphael/g.raphael.line.js b/externals/raphael/g.raphael.line.js index 13e89d37e8..2c8925ddc2 100644 --- a/externals/raphael/g.raphael.line.js +++ b/externals/raphael/g.raphael.line.js @@ -1,5 +1,6 @@ /** * @provides raphael-g-line + * @do-not-minify */ /*! * g.Raphael 0.5 - Charting library, based on Raphaël diff --git a/externals/raphael/raphael.js b/externals/raphael/raphael.js index e183167f6c..fbd1fab40d 100644 --- a/externals/raphael/raphael.js +++ b/externals/raphael/raphael.js @@ -1,5 +1,6 @@ /** * @provides raphael-core + * @do-not-minify */ // ┌─────────────────────────────────────────────────────────────────────┐ \\ // │ Raphaël 2.0.1 - JavaScript Vector Library │ \\ diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 9d60db7181..18222ae17f 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -1970,7 +1970,7 @@ celerity_register_resource_map(array( ), 'raphael-core' => array( - 'uri' => '/res/bae05d27/rsrc/js/raphael/raphael.js', + 'uri' => '/res/3f48575a/rsrc/js/raphael/raphael.js', 'type' => 'js', 'requires' => array( @@ -1979,7 +1979,7 @@ celerity_register_resource_map(array( ), 'raphael-g' => array( - 'uri' => '/res/8bbdbea8/rsrc/js/raphael/g.raphael.js', + 'uri' => '/res/b07e5245/rsrc/js/raphael/g.raphael.js', 'type' => 'js', 'requires' => array( @@ -1988,7 +1988,7 @@ celerity_register_resource_map(array( ), 'raphael-g-line' => array( - 'uri' => '/res/54504ae4/rsrc/js/raphael/g.raphael.line.js', + 'uri' => '/res/a59c8556/rsrc/js/raphael/g.raphael.line.js', 'type' => 'js', 'requires' => array( diff --git a/src/infrastructure/celerity/controller/CelerityResourceController.php b/src/infrastructure/celerity/controller/CelerityResourceController.php index 4ef21895f1..7a725089d4 100644 --- a/src/infrastructure/celerity/controller/CelerityResourceController.php +++ b/src/infrastructure/celerity/controller/CelerityResourceController.php @@ -107,6 +107,12 @@ final class CelerityResourceController extends AphrontController { return $data; } + // Some resources won't survive minification (like Raphael.js), and are + // marked so as not to be minified. + if (strpos($data, '@'.'do-not-minify') !== false) { + return $data; + } + switch ($type) { case 'css': // Remove comments.