Merge branch 'pentool' into brushtool

Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
author: Pushkar Joshi 2012-02-24 12:08:49 -0800
committer: Pushkar Joshi 2012-02-24 12:08:49 -0800
commit: 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree: c51112223ceb9121cd595a60335eb2795215590f /imports/codemirror/mode/gfm
parent: fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent: 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download: ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
2 files changed, 155 insertions, 0 deletions
diff --git a/imports/codemirror/mode/gfm/gfm.js b/imports/codemirror/mode/gfm/gfm.js
new file mode 100755
index 00000000..1e9d7d87
--- /dev/null
+++ b/imports/codemirror/mode/gfm/gfm.js
@@ -0,0 +1,108 @@
+CodeMirror.defineMode("gfm", function(config, parserConfig) {
+  var mdMode = CodeMirror.getMode(config, "markdown");
+  var aliases = {
+    html: "htmlmixed",
+    js: "javascript",
+    json: "application/json",
+    c: "text/x-csrc",
+    "c++": "text/x-c++src",
+    java: "text/x-java",
+    csharp: "text/x-csharp",
+    "c#": "text/x-csharp",
+  };
+  // make this lazy so that we don't need to load GFM last
+  var getMode = (function () {
+    var i, modes = {}, mimes = {}, mime;
+    var list = CodeMirror.listModes();
+    for (i = 0; i < list.length; i++) {
+      modes[list[i]] = list[i];
+    }
+    var mimesList = CodeMirror.listMIMEs();
+    for (i = 0; i < mimesList.length; i++) {
+      mime = mimesList[i].mime;
+      mimes[mime] = mimesList[i].mime;
+    }
+    for (var a in aliases) {
+      if (aliases[a] in modes || aliases[a] in mimes)
+        modes[a] = aliases[a];
+    }
+    
+    return function (lang) {
+      return modes[lang] ? CodeMirror.getMode(config, modes[lang]) : null;
+    }
+  }());
+  function markdown(stream, state) {
+    // intercept fenced code blocks
+    if (stream.sol() && stream.match(/^```([\w+#]*)/)) {
+      // try switching mode
+      state.localMode = getMode(RegExp.$1)
+      if (state.localMode)
+        state.localState = state.localMode.startState();
+      state.token = local;
+      return 'code';
+    }
+    return mdMode.token(stream, state.mdState);
+  }
+  function local(stream, state) {
+    if (stream.sol() && stream.match(/^```/)) {
+      state.localMode = state.localState = null;
+      state.token = markdown;
+      return 'code';
+    }
+    else if (state.localMode) {
+      return state.localMode.token(stream, state.localState);
+    } else {
+      stream.skipToEnd();
+      return 'code';
+    }
+  }
+  // custom handleText to prevent emphasis in the middle of a word
+  // and add autolinking
+  function handleText(stream, mdState) {
+    var match;
+    if (stream.match(/^\w+:\/\/\S+/)) {
+      return 'linkhref';
+    }
+    if (stream.match(/^[^\[*\\<>` _][^\[*\\<>` ]*[^\[*\\<>` _]/)) {
+      return mdMode.getType(mdState);
+    }
+    if (match = stream.match(/^[^\[*\\<>` ]+/)) {
+      var word = match[0];
+      if (word[0] === '_' && word[word.length-1] === '_') {
+        stream.backUp(word.length);
+        return undefined;
+      }
+      return mdMode.getType(mdState);
+    }
+    if (stream.eatSpace()) {
+      return null;
+    }
+  }
+  return {
+    startState: function() {
+      var mdState = mdMode.startState();
+      mdState.text = handleText;
+      return {token: markdown, mode: "markdown", mdState: mdState,
+              localMode: null, localState: null};
+    },
+    copyState: function(state) {
+      return {token: state.token, mode: state.mode, mdState: CodeMirror.copyState(mdMode, state.mdState),
+              localMode: state.localMode,
+              localState: state.localMode ? CodeMirror.copyState(state.localMode, state.localState) : null};
+    },
+    token: function(stream, state) {
+      return state.token(stream, state);
+    }
+  }
+});
diff --git a/imports/codemirror/mode/gfm/index.html b/imports/codemirror/mode/gfm/index.html
new file mode 100755
index 00000000..b27d49ab
--- /dev/null
+++ b/imports/codemirror/mode/gfm/index.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror: GFM mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="../xml/xml.js"></script>
+    <script src="../markdown/markdown.js"></script>
+    <script src="gfm.js"></script>
+    <script src="../javascript/javascript.js"></script>
+    <link rel="stylesheet" href="../markdown/markdown.css">
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror: GFM mode</h1>
+<!-- source: http://daringfireball.net/projects/markdown/basics.text -->
+<form><textarea id="code" name="code">
+Github Flavored Markdown
+========================
+Everything from markdown plus GFM features:
+## Fenced code blocks
+```javascript
+for (var i = 0; i &lt; items.length; i++) {
+    console.log(items[i], i); // log them
+}
+```
+See http://github.github.com/github-flavored-markdown/
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: 'gfm',
+        lineNumbers: true,
+        matchBrackets: true,
+        theme: "default"
+      });
+    </script>
+  </body>
+</html>
author	Pushkar Joshi	2012-02-24 12:08:49 -0800
committer	Pushkar Joshi	2012-02-24 12:08:49 -0800
commit	03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
tree	c51112223ceb9121cd595a60335eb2795215590f /imports/codemirror/mode/gfm
parent	fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent	053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download	ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz

diff --git a/imports/codemirror/mode/gfm/gfm.js b/imports/codemirror/mode/gfm/gfm.js new file mode 100755 index 00000000..1e9d7d87 --- /dev/null +++ b/imports/codemirror/mode/gfm/gfm.js
@@ -0,0 +1,108 @@
	1	CodeMirror.defineMode("gfm", function(config, parserConfig) {
	2	var mdMode = CodeMirror.getMode(config, "markdown");
	3	var aliases = {
	4	html: "htmlmixed",
	5	js: "javascript",
	6	json: "application/json",
	7	c: "text/x-csrc",
	8	"c++": "text/x-c++src",
	9	java: "text/x-java",
	10	csharp: "text/x-csharp",
	11	"c#": "text/x-csharp",
	12	};
	13
	14	// make this lazy so that we don't need to load GFM last
	15	var getMode = (function () {
	16	var i, modes = {}, mimes = {}, mime;
	17
	18	var list = CodeMirror.listModes();
	19	for (i = 0; i < list.length; i++) {
	20	modes[list[i]] = list[i];
	21	}
	22	var mimesList = CodeMirror.listMIMEs();
	23	for (i = 0; i < mimesList.length; i++) {
	24	mime = mimesList[i].mime;
	25	mimes[mime] = mimesList[i].mime;
	26	}
	27
	28	for (var a in aliases) {
	29	if (aliases[a] in modes \|\| aliases[a] in mimes)
	30	modes[a] = aliases[a];
	31	}
	32
	33	return function (lang) {
	34	return modes[lang] ? CodeMirror.getMode(config, modes[lang]) : null;
	35	}
	36	}());
	37
	38	function markdown(stream, state) {
	39	// intercept fenced code blocks
	40	if (stream.sol() && stream.match(/^```([\w+#]*)/)) {
	41	// try switching mode
	42	state.localMode = getMode(RegExp.$1)
	43	if (state.localMode)
	44	state.localState = state.localMode.startState();
	45
	46	state.token = local;
	47	return 'code';
	48	}
	49
	50	return mdMode.token(stream, state.mdState);
	51	}
	52
	53	function local(stream, state) {
	54	if (stream.sol() && stream.match(/^```/)) {
	55	state.localMode = state.localState = null;
	56	state.token = markdown;
	57	return 'code';
	58	}
	59	else if (state.localMode) {
	60	return state.localMode.token(stream, state.localState);
	61	} else {
	62	stream.skipToEnd();
	63	return 'code';
	64	}
	65	}
	66
	67	// custom handleText to prevent emphasis in the middle of a word
	68	// and add autolinking
	69	function handleText(stream, mdState) {
	70	var match;
	71	if (stream.match(/^\w+:\/\/\S+/)) {
	72	return 'linkhref';
	73	}
	74	if (stream.match(/^[^\[\\<>` _][^\[\\<>` ][^\[\\<>` _]/)) {
	75	return mdMode.getType(mdState);
	76	}
	77	if (match = stream.match(/^[^\[*\\<>` ]+/)) {
	78	var word = match[0];
	79	if (word[0] === '_' && word[word.length-1] === '_') {
	80	stream.backUp(word.length);
	81	return undefined;
	82	}
	83	return mdMode.getType(mdState);
	84	}
	85	if (stream.eatSpace()) {
	86	return null;
	87	}
	88	}
	89
	90	return {
	91	startState: function() {
	92	var mdState = mdMode.startState();
	93	mdState.text = handleText;
	94	return {token: markdown, mode: "markdown", mdState: mdState,
	95	localMode: null, localState: null};
	96	},
	97
	98	copyState: function(state) {
	99	return {token: state.token, mode: state.mode, mdState: CodeMirror.copyState(mdMode, state.mdState),
	100	localMode: state.localMode,
	101	localState: state.localMode ? CodeMirror.copyState(state.localMode, state.localState) : null};
	102	},
	103
	104	token: function(stream, state) {
	105	return state.token(stream, state);
	106	}
	107	}
	108	});


diff --git a/imports/codemirror/mode/gfm/index.html b/imports/codemirror/mode/gfm/index.html new file mode 100755 index 00000000..b27d49ab --- /dev/null +++ b/imports/codemirror/mode/gfm/index.html
@@ -0,0 +1,47 @@
	1	<!doctype html>
	2	<html>
	3	<head>
	4	<title>CodeMirror: GFM mode</title>
	5	<link rel="stylesheet" href="../../lib/codemirror.css">
	6	<script src="../../lib/codemirror.js"></script>
	7	<script src="../xml/xml.js"></script>
	8	<script src="../markdown/markdown.js"></script>
	9	<script src="gfm.js"></script>
	10	<script src="../javascript/javascript.js"></script>
	11	<link rel="stylesheet" href="../markdown/markdown.css">
	12	<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
	13	<link rel="stylesheet" href="../../doc/docs.css">
	14	</head>
	15	<body>
	16	<h1>CodeMirror: GFM mode</h1>
	17
	18	<!-- source: http://daringfireball.net/projects/markdown/basics.text -->
	19	<form><textarea id="code" name="code">
	20	Github Flavored Markdown
	21	========================
	22
	23	Everything from markdown plus GFM features:
	24
	25	## Fenced code blocks
	26
	27	```javascript
	28	for (var i = 0; i < items.length; i++) {
	29	console.log(items[i], i); // log them
	30	}
	31	```
	32
	33	See http://github.github.com/github-flavored-markdown/
	34
	35	</textarea></form>
	36
	37	<script>
	38	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
	39	mode: 'gfm',
	40	lineNumbers: true,
	41	matchBrackets: true,
	42	theme: "default"
	43	});
	44	</script>
	45
	46	</body>
	47	</html>