From 2d247322f9a828b9fa4771ccd82bc774a6683890 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 28 May 2013 00:07:29 +0100 Subject: [PATCH] convert plugin line-end format to unix-style LF only, from CR-LF or CR --- mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java index 75d87a7b..2b01a5a1 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java @@ -247,6 +247,8 @@ public class IITC_WebViewClient extends WebViewClient { if (!file.endsWith("user.js")) return ""; String js = fileToString(file, asset); if (js == "false") return ""; + js = js.replaceAll("\r\n", "\n"); //convert CR-LF pairs to LF - windows format text files + js = js.replaceAll("\r", "\n"); //convert remaining CR to LF - Mac format files(?) String wrapper_start = "function wrapper() {"; String wrapper_end = "} // wrapper end"; String injection_code = "// inject code into site context\n" + @@ -316,4 +318,4 @@ public class IITC_WebViewClient extends WebViewClient { return true; } } -} \ No newline at end of file +}