diff options
author | Wu Cheng-Han | 2015-05-04 15:53:29 +0800 |
---|---|---|
committer | Wu Cheng-Han | 2015-05-04 15:53:29 +0800 |
commit | 4b0ca55eb79e963523eb6c8197825e9e8ae904e2 (patch) | |
tree | 574f3923af77b37b41dbf1b00bcd7827ef724a28 /public/vendor/codemirror/mode/diff | |
parent | 61eb11d23c65c9e5c493c67d055f785cbec139e2 (diff) |
First commit, version 0.2.7
Diffstat (limited to 'public/vendor/codemirror/mode/diff')
-rwxr-xr-x | public/vendor/codemirror/mode/diff/diff.js | 47 | ||||
-rwxr-xr-x | public/vendor/codemirror/mode/diff/index.html | 117 |
2 files changed, 164 insertions, 0 deletions
diff --git a/public/vendor/codemirror/mode/diff/diff.js b/public/vendor/codemirror/mode/diff/diff.js new file mode 100755 index 00000000..fe0305e7 --- /dev/null +++ b/public/vendor/codemirror/mode/diff/diff.js @@ -0,0 +1,47 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: http://codemirror.net/LICENSE + +(function(mod) { + if (typeof exports == "object" && typeof module == "object") // CommonJS + mod(require("../../lib/codemirror")); + else if (typeof define == "function" && define.amd) // AMD + define(["../../lib/codemirror"], mod); + else // Plain browser env + mod(CodeMirror); +})(function(CodeMirror) { +"use strict"; + +CodeMirror.defineMode("diff", function() { + + var TOKEN_NAMES = { + '+': 'positive', + '-': 'negative', + '@': 'meta' + }; + + return { + token: function(stream) { + var tw_pos = stream.string.search(/[\t ]+?$/); + + if (!stream.sol() || tw_pos === 0) { + stream.skipToEnd(); + return ("error " + ( + TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, ''); + } + + var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd(); + + if (tw_pos === -1) { + stream.skipToEnd(); + } else { + stream.pos = tw_pos; + } + + return token_name; + } + }; +}); + +CodeMirror.defineMIME("text/x-diff", "diff"); + +}); diff --git a/public/vendor/codemirror/mode/diff/index.html b/public/vendor/codemirror/mode/diff/index.html new file mode 100755 index 00000000..0af611fa --- /dev/null +++ b/public/vendor/codemirror/mode/diff/index.html @@ -0,0 +1,117 @@ +<!doctype html> + +<title>CodeMirror: Diff mode</title> +<meta charset="utf-8"/> +<link rel=stylesheet href="../../doc/docs.css"> + +<link rel="stylesheet" href="../../lib/codemirror.css"> +<script src="../../lib/codemirror.js"></script> +<script src="diff.js"></script> +<style> + .CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;} + span.cm-meta {color: #a0b !important;} + span.cm-error { background-color: black; opacity: 0.4;} + span.cm-error.cm-string { background-color: red; } + span.cm-error.cm-tag { background-color: #2b2; } + </style> +<div id=nav> + <a href="http://codemirror.net"><h1>CodeMirror</h1><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/codemirror/codemirror">Code</a> + </ul> + <ul> + <li><a href="../index.html">Language modes</a> + <li><a class=active href="#">Diff</a> + </ul> +</div> + +<article> +<h2>Diff mode</h2> +<form><textarea id="code" name="code"> +diff --git a/index.html b/index.html +index c1d9156..7764744 100644 +--- a/index.html ++++ b/index.html +@@ -95,7 +95,8 @@ StringStream.prototype = { + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, +- autoMatchBrackets: true ++ autoMatchBrackets: true, ++ onGutterClick: function(x){console.log(x);} + }); + </script> + </body> +diff --git a/lib/codemirror.js b/lib/codemirror.js +index 04646a9..9a39cc7 100644 +--- a/lib/codemirror.js ++++ b/lib/codemirror.js +@@ -399,10 +399,16 @@ var CodeMirror = (function() { + } + + function onMouseDown(e) { +- var start = posFromMouse(e), last = start; ++ var start = posFromMouse(e), last = start, target = e.target(); + if (!start) return; + setCursor(start.line, start.ch, false); + if (e.button() != 1) return; ++ if (target.parentNode == gutter) { ++ if (options.onGutterClick) ++ options.onGutterClick(indexOf(gutter.childNodes, target) + showingFrom); ++ return; ++ } ++ + if (!focused) onFocus(); + + e.stop(); +@@ -808,7 +814,7 @@ var CodeMirror = (function() { + for (var i = showingFrom; i < showingTo; ++i) { + var marker = lines[i].gutterMarker; + if (marker) html.push('<div class="' + marker.style + '">' + htmlEscape(marker.text) + '</div>'); +- else html.push("<div>" + (options.lineNumbers ? i + 1 : "\u00a0") + "</div>"); ++ else html.push("<div>" + (options.lineNumbers ? i + options.firstLineNumber : "\u00a0") + "</div>"); + } + gutter.style.display = "none"; // TODO test whether this actually helps + gutter.innerHTML = html.join(""); +@@ -1371,10 +1377,8 @@ var CodeMirror = (function() { + if (option == "parser") setParser(value); + else if (option === "lineNumbers") setLineNumbers(value); + else if (option === "gutter") setGutter(value); +- else if (option === "readOnly") options.readOnly = value; +- else if (option === "indentUnit") {options.indentUnit = indentUnit = value; setParser(options.parser);} +- else if (/^(?:enterMode|tabMode|indentWithTabs|readOnly|autoMatchBrackets|undoDepth)$/.test(option)) options[option] = value; +- else throw new Error("Can't set option " + option); ++ else if (option === "indentUnit") {options.indentUnit = value; setParser(options.parser);} ++ else options[option] = value; + }, + cursorCoords: cursorCoords, + undo: operation(undo), +@@ -1402,7 +1406,8 @@ var CodeMirror = (function() { + replaceRange: operation(replaceRange), + + operation: function(f){return operation(f)();}, +- refresh: function(){updateDisplay([{from: 0, to: lines.length}]);} ++ refresh: function(){updateDisplay([{from: 0, to: lines.length}]);}, ++ getInputField: function(){return input;} + }; + return instance; + } +@@ -1420,6 +1425,7 @@ var CodeMirror = (function() { + readOnly: false, + onChange: null, + onCursorActivity: null, ++ onGutterClick: null, + autoMatchBrackets: false, + workTime: 200, + workDelay: 300, +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); + </script> + + <p><strong>MIME types defined:</strong> <code>text/x-diff</code>.</p> + + </article> |