Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Using UTF-8 as the default encoding rather than System.getProperty("f…

…ile.encoding") [fixes #2528014].
  • Loading branch information...
commit 1e10c3504d5394d2ecd9c83a5d918f1669cbb21d 1 parent 6e67ea0
Adam Moore authored
View
13 src/com/yahoo/platform/yui/compressor/YUICompressor.java
@@ -47,10 +47,15 @@ public static void main(String args[]) {
String charset = (String) parser.getOptionValue(charsetOpt);
if (charset == null || !Charset.isSupported(charset)) {
- charset = System.getProperty("file.encoding");
- if (charset == null) {
- charset = "UTF-8";
- }
+ // charset = System.getProperty("file.encoding");
+ // if (charset == null) {
+ // charset = "UTF-8";
+ // }
+
+ // UTF-8 seems to be a better choice than what the system is reporting
+ charset = "UTF-8";
+
+
if (verbose) {
System.err.println("\n[INFO] Using charset " + charset);
}
View
11 tests/_munge.js
@@ -1,17 +1,8 @@
(function() {
var w = window;
- // logger
- //
- // var c = 1..toString();
-
w.hello = function(a, abc) {
- // "a:nomunge"; // this useless statement causes a munging error
- var xyz = "a:nomunge",
- d = abc; // but it works fine like this
-
-
-
+ "a:nomunge";
w.alert("Hello, " + a);
};
})();
View
1  tests/_munge.js.min
@@ -0,0 +1 @@
+(function(){var a=window;a.hello=function(a,b){a.alert("Hello, "+a)}})();
View
1  tests/_string_combo.js.min
@@ -0,0 +1 @@
+function test(){var b="abc"};
View
1  tests/_syntax_error.js.min
@@ -0,0 +1 @@
+window.$=$telerik.$;$(document).ready(function(){movePageElements();var a=$("textarea").val();if(a!=""){$("textarea").attr("style","display: block;")}else{$("textarea").attr("style","display: none;")}a=null});function movePageElements(){var e=null;var b=$(".pagecontrolscontainer");if(b.length>0){var e=b.attr("pagenumber");if((e>5)&&(e<28)){var a=$("div#commentbutton");$("div.buttonContainer").prepend(a)}else{$("div#commentbutton").attr("style","display: none;")}}if((e>5)&&(e<28)){var f=$(".dropshadow-top");var d=$("#dropshadow");var c=$(".dropshadow-bottom");$("#page").prepend(f);$("#topcontainer").after(d);d.append($("#topcontainer"));d.after(c)}e=null;b=null;f=null;d=null;c=null}function expandCollapseDiv(a){$telerik.$(a).slideToggle("slow")}function expandCollapseHelp(){$(".helpitems").slideToggle("slow");if($("#helpcontainer").length){$("#help-dropshadow-bot").insertAfter("#helpcontainer");$("#help-dropshadow-bot").removeAttr("style")}}function expandCollapseComments(){var a=$("textarea").attr("style");if(a=="display: none;"){$("textarea").fadeIn().focus()}else{$("textarea").fadeOut()}a=null};

0 comments on commit 1e10c35

Please sign in to comment.
Something went wrong with that request. Please try again.