123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107 |
- <!doctype html>
- <title>CodeMirror: merge view demo</title>
- <meta charset="utf-8"/>
- <link rel=stylesheet href="../doc/docs.css">
- <link rel=stylesheet href="../lib/codemirror.css">
- <link rel=stylesheet href="../addon/merge/merge.css">
- <script src="../lib/codemirror.js"></script>
- <script src="../mode/xml/xml.js"></script>
- <script src="//cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
- <script src="../addon/merge/merge.js"></script>
- <style>
- .CodeMirror { line-height: 1.2; }
- span.clicky {
- cursor: pointer;
- background: #d70;
- color: white;
- padding: 0 3px;
- border-radius: 3px;
- }
- </style>
- <div id=nav>
- <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
- <ul>
- <li><a href="../index.html">Home</a>
- <li><a href="../doc/manual.html">Manual</a>
- <li><a href="https://github.com/marijnh/codemirror">Code</a>
- </ul>
- <ul>
- <li><a class=active href="#">merge view</a>
- </ul>
- </div>
- <article>
- <h2>merge view demo</h2>
- <div id=view></div>
- <p>The <a href="../doc/manual.html#addon_merge"><code>merge</code></a>
- addon provides an interface for displaying and merging diffs,
- either <span class=clicky onclick="initUI(2)">two-way</span>
- or <span class=clicky onclick="initUI(3)">three-way</span>. The left
- (or center) pane is editable, and the differences with the other
- pane(s) are <span class=clicky onclick="toggleDifferences()">optionally</span> shown live as you edit it.</p>
- <p>This addon depends on
- the <a href="https://code.google.com/p/google-diff-match-patch/">google-diff-match-patch</a>
- library to compute the diffs.</p>
- <script>
- var value, orig1, orig2, dv, hilight= true;
- function initUI(panes) {
- if (value == null) return;
- var target = document.getElementById("view");
- target.innerHTML = "";
- dv = CodeMirror.MergeView(target, {
- value: value,
- origLeft: panes == 3 ? orig1 : null,
- orig: orig2,
- lineNumbers: true,
- mode: "text/html",
- highlightDifferences: hilight
- });
- }
- function toggleDifferences() {
- dv.setShowDifferences(hilight = !hilight);
- }
- window.onload = function() {
- value = document.documentElement.innerHTML;
- orig1 = value.replace(/\.\.\//g, "codemirror/").replace("yellow", "orange");
- orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
- .replace("white", "purple;\n font: comic sans;\n text-decoration: underline;\n height: 15em");
- initUI(2);
- };
- function mergeViewHeight(mergeView) {
- function editorHeight(editor) {
- if (!editor) return 0;
- return editor.getScrollInfo().height;
- }
- return Math.max(editorHeight(mergeView.leftOriginal()),
- editorHeight(mergeView.editor()),
- editorHeight(mergeView.rightOriginal()));
- }
- function resize(mergeView) {
- var height = mergeViewHeight(mergeView);
- for(;;) {
- if (mergeView.leftOriginal())
- mergeView.leftOriginal().setSize(null, height);
- mergeView.editor().setSize(null, height);
- if (mergeView.rightOriginal())
- mergeView.rightOriginal().setSize(null, height);
- var newHeight = mergeViewHeight(mergeView);
- if (newHeight >= height) break;
- else height = newHeight;
- }
- mergeView.wrap.style.height = height + "px";
- }
- </script>
- </article>
|