Merge pull request #198 from zanata/fix-codemirror3-commits

fix style for visible space and new line
zanata · Sep 24, 2013 · b7f74cf · b7f74cf
2 parents 6f83d98 + 4760809
commit b7f74cf
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 218 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
@@ -60,7 +60,7 @@ private void highlight()
       Element preElement = getElement().getFirstChildElement();
       Highlighting.syntaxHighlight(Strings.nullToEmpty(plainText), preElement);
       preElement.addClassName("cm-s-default");
-      String styled = preElement.getInnerHTML().replaceAll("<br>", "<span class='newline'></span><br>");
+      String styled = preElement.getInnerHTML().replaceAll("\\n", "<span class='newline'></span>\n");
       preElement.setInnerHTML(styled);
    }
 

diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Dummy.html b/zanata-war/src/main/resources/org/zanata/webtrans/public/Dummy.html
@@ -10,8 +10,8 @@
     <link rel="stylesheet" href="images/fontello/css/fontello.css" />
     <link rel="stylesheet" href="../stylesheet/menu.css" />
 
-    <script src="codemirror-compressed-old.js" type="text/javascript"></script>
-    <link rel="stylesheet" type="text/css" href="codemirror-old.css"/>
+    <script src="codemirror-compressed.js" type="text/javascript"></script>
+    <link rel="stylesheet" type="text/css" href="codemirror.css"/>
 
     <script src="diff_match_patch/javascript/diff_match_patch.js" type="text/javascript"></script>
 

diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror-compressed-old.js b/zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror-compressed-old.js
diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror-old.css b/zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror-old.css
diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css b/zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
@@ -259,3 +259,39 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
     visibility: hidden;
   }
 }
+
+/* show visible tab */
+.cm-tab:after {
+    content: "\21e5";
+    display: inline-block;
+    width: 1em;
+    position: relative;
+    overflow: visible;
+    color: #aaa;
+}
+
+/* visible space */
+.cm-space
+{
+    border-bottom: #dcecf7 solid 2px;
+}
+
+/* visible line break*/
+.CodeMirror-code .CodeMirror-cursor:after
+{
+    content: '';
+}
+.CodeMirror-code pre:after
+{
+    content: '\00b6';
+    color: #aaaaaa;
+}
+.CodeMirror-code div:last-child pre:after {
+    content: '';
+}
+
+/* for highlighting label (runs code mirror runmode) */
+.newline:after {
+    content: '\00b6';
+    color: #aaaaaa;
+}