Udpates to Yahoo YUI Compressor defaults. Updated default encoding.

skroonenburg · Nov 15, 2011 · 8c1abe5 · 8c1abe5
1 parent c8b24b0
commit 8c1abe5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/Nuspec/Rejuicer.nuspec b/Nuspec/Rejuicer.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Rejuicer</id>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
     <authors>Sam Kroonenburg</authors>
     <description>Minify your CSS/JS. Simple fluent configuration. Wildcard file matching. Browser caching. Works on Azure. Easy script debugging.</description>
     <language>en-US</language>

diff --git a/Source/Rejuicer/Rejuicer/Engine/MinificationProviders/JsMinificationProvider.cs b/Source/Rejuicer/Rejuicer/Engine/MinificationProviders/JsMinificationProvider.cs
@@ -12,27 +12,21 @@ public class JsMinificationProvider : BaseStringMinificationProvider
     {
         public override string MinifyStringValue(string data)
         {
-            var currentCulture = Thread.CurrentThread.CurrentCulture;
-
             try
             {
-                Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
 
                 if (string.IsNullOrEmpty(data))
                 {
                     return "";
                 }
-
-                return Yahoo.Yui.Compressor.JavaScriptCompressor.Compress(data);
+
+                // Uses the same default values as Yahoo YUI Compressor
+                return Yahoo.Yui.Compressor.JavaScriptCompressor.Compress(data, true, true, false, false, -1, Encoding.UTF8, CultureInfo.InvariantCulture);
             }
             catch (InvalidOperationException e)
             {
                 throw new InvalidOperationException("Encountered exception trying minify invalid JavaScript.", e);
             }
-            finally
-            {
-                Thread.CurrentThread.CurrentCulture = currentCulture;
-            }
 
         }
 

diff --git a/Source/Rejuicer/Rejuicer/Properties/AssemblyInfo.cs b/Source/Rejuicer/Rejuicer/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.7.0")]
-[assembly: AssemblyFileVersion("1.2.7.0")]
+[assembly: AssemblyVersion("1.2.8.0")]
+[assembly: AssemblyFileVersion("1.2.8.0")]
 [assembly: InternalsVisibleTo("Rejuicer-test")]
 [assembly: InternalsVisibleTo("RejuicerConfiguration-test")]