Commit @7527fae410f6dc4e0fd096c797cad013d600b676

[Notice] Announcing the End of Demo Server [Read me]

Mijeong Park 2018-02-14

issue: Fix the bug of missing new line highlight in email noti

@7527fae410f6dc4e0fd096c797cad013d600b676

e11f85a

7527fae

app/utils/DiffUtil.java

--- app/utils/DiffUtil.java

+++ app/utils/DiffUtil.java


             }
         }
 
-        return sb.toString().replaceAll("\n", "<br/>\n");
+        return sb.toString().replaceAll("\n", "&nbsp<br/>\n");
     }
 
     public static String getDiffPlainText(String oldValue, String newValue) {

e11f85a

7527fae

test/utils/DiffUtilTest.java

--- test/utils/DiffUtilTest.java

+++ test/utils/DiffUtilTest.java


     String DIFF_INSERT_PREFIX = "<span style='background-color: #abdd52;padding: 2px 0;'>";
     String DIFF_INSERT_POSTFIX = "</span>";
 
-    String DIFF_EQUAL_PREFIX = "<span style='color: #bdbdbd;font-size: 16px;font-family: serif;'>...<br/>\n"
-            + "......<br/>\n"
-            + "......<br/>\n"
+    String DIFF_EQUAL_PREFIX = "<span style='color: #bdbdbd;font-size: 16px;font-family: serif;'>...&nbsp<br/>\n"
+            + "......&nbsp<br/>\n"
+            + "......&nbsp<br/>\n"
             + "...</span>";
 
     String DIFF_NEW_LINE = "\n";

Add a comment

Open 0
Closed 0

List

...	...	@@ -57,7 +57,7 @@
57	57	}
58	58	}
59	59
60		- return sb.toString().replaceAll("\n", "<br/>\n");
	60	+ return sb.toString().replaceAll("\n", "&nbsp<br/>\n");
61	61	}
62	62
63	63	public static String getDiffPlainText(String oldValue, String newValue) {

...	...	@@ -17,9 +17,9 @@
17	17	String DIFF_INSERT_PREFIX = "<span style='background-color: #abdd52;padding: 2px 0;'>";
18	18	String DIFF_INSERT_POSTFIX = "</span>";
19	19
20		- String DIFF_EQUAL_PREFIX = "<span style='color: #bdbdbd;font-size: 16px;font-family: serif;'>...<br/>\n"
21		- + "......<br/>\n"
22		- + "......<br/>\n"
	20	+ String DIFF_EQUAL_PREFIX = "<span style='color: #bdbdbd;font-size: 16px;font-family: serif;'>...&nbsp<br/>\n"
	21	+ + "......&nbsp<br/>\n"
	22	+ + "......&nbsp<br/>\n"
23	23	+ "...</span>";
24	24
25	25	String DIFF_NEW_LINE = "\n";

Delete comment