Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #358 from zanata/upgrade-codemirror
Browse files Browse the repository at this point in the history
upgrade codemirror to 3.21 to fix rhbz968619
  • Loading branch information
Alex Eng committed Feb 10, 2014
2 parents 0da2be0 + 8de664d commit fe7cb37
Show file tree
Hide file tree
Showing 7 changed files with 458 additions and 446 deletions.
Expand Up @@ -26,10 +26,10 @@
<link type="text/css" rel="stylesheet"
href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic"/>

<script src="codemirror/codemirror-compressed-3.16.cache.js"
<script src="codemirror/codemirror-compressed-3.21.cache.js"
type="text/javascript"></script>
<link rel="stylesheet" type="text/css"
href="codemirror/codemirror-3.16.cache.css"/>
href="codemirror/codemirror-3.21.cache.css"/>

<script src="diff_match_patch/javascript/diff_match_patch.js"
type="text/javascript"></script>
Expand Down
Expand Up @@ -10,8 +10,8 @@
<link rel="stylesheet" href="images/fontello/css/fontello.css"/>
<link rel="stylesheet" href="../stylesheet/menu.css"/>

<script src="codemirror/codemirror-compressed-3.16.cache.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="codemirror/codemirror-3.16.cache.css"/>
<script src="codemirror/codemirror-compressed-3.21.cache.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" href="codemirror/codemirror-3.21.cache.css"/>

<script src="diff_match_patch/javascript/diff_match_patch.js"
type="text/javascript"></script>
Expand Down
Expand Up @@ -15,9 +15,9 @@ includes:
- htmlmixed.js
- javascript.js
- xml.js
- overlay.js (to support visible space)
- runmode.js
- searchcursor.js (to enable highlight search term within codemirror"
- overlay.js (to support visible space)

added following custom code when generating the codemirror-compressed.js (to support visible space):

Expand All @@ -34,3 +34,11 @@ CodeMirror.defineMode("visibleSpace", function(config, parserConfig) {
};
return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "htmlmixed"), visibleSpaceOverlay);
});

Also download new css file from codemirror and compare it with current one. Add the missing bits.
hint:
.CodeMirror {
min-height: 4em;
height: auto;
}
and last a few classes with comment "show visible tab" etc.

0 comments on commit fe7cb37

Please sign in to comment.