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/htmlembedded
parent: fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent: 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download: ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
2 files changed, 117 insertions, 0 deletions
diff --git a/imports/codemirror/mode/htmlembedded/htmlembedded.js b/imports/codemirror/mode/htmlembedded/htmlembedded.js
new file mode 100755
index 00000000..08e170ea
--- /dev/null
+++ b/imports/codemirror/mode/htmlembedded/htmlembedded.js
@@ -0,0 +1,68 @@
+CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+  
+  //config settings
+  var scriptStartRegex = parserConfig.scriptStartRegex || /^<%/i,
+      scriptEndRegex = parserConfig.scriptEndRegex || /^%>/i;
+  
+  //inner modes
+  var scriptingMode, htmlMixedMode;
+  
+  //tokenizer when in html mode
+  function htmlDispatch(stream, state) {
+      if (stream.match(scriptStartRegex, false)) {
+          state.token=scriptingDispatch;
+          return scriptingMode.token(stream, state.scriptState);
+          }
+      else
+          return htmlMixedMode.token(stream, state.htmlState);
+    }
+  //tokenizer when in scripting mode
+  function scriptingDispatch(stream, state) {
+      if (stream.match(scriptEndRegex, false))  {
+          state.token=htmlDispatch;
+          return htmlMixedMode.token(stream, state.htmlState);
+         }
+      else
+          return scriptingMode.token(stream, state.scriptState);
+         }
+  return {
+    startState: function() {
+      scriptingMode = scriptingMode || CodeMirror.getMode(config, parserConfig.scriptingModeSpec);
+      htmlMixedMode = htmlMixedMode || CodeMirror.getMode(config, "htmlmixed");
+      return { 
+          token :  parserConfig.startOpen ? scriptingDispatch : htmlDispatch,
+          htmlState : htmlMixedMode.startState(),
+          scriptState : scriptingMode.startState()
+          }
+    },
+    token: function(stream, state) {
+      return state.token(stream, state);
+    },
+    indent: function(state, textAfter) {
+      if (state.token == htmlDispatch)
+        return htmlMixedMode.indent(state.htmlState, textAfter);
+      else
+        return scriptingMode.indent(state.scriptState, textAfter);
+    },
+    
+    copyState: function(state) {
+      return {
+       token : state.token,
+       htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState),
+       scriptState : CodeMirror.copyState(scriptingMode, state.scriptState)
+       }
+    },
+    
+    electricChars: "/{}:"
+  }
+});
+CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
+CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
+CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
diff --git a/imports/codemirror/mode/htmlembedded/index.html b/imports/codemirror/mode/htmlembedded/index.html
new file mode 100755
index 00000000..c1374e58
--- /dev/null
+++ b/imports/codemirror/mode/htmlembedded/index.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror: Html Embedded Scripts mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="../xml/xml.js"></script>
+    <script src="../javascript/javascript.js"></script>
+    <script src="../css/css.js"></script>
+    <script src="../htmlmixed/htmlmixed.js"></script>
+    <script src="htmlembedded.js"></script>
+    <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: Html Embedded Scripts mode</h1>
+<form><textarea id="code" name="code">
+<%
+function hello(who) {
+        return "Hello " + who;
+}
+%>
+This is an example of EJS (embedded javascript)
+<p>The program says <%= hello("world") %>.</p>
+<script>
+        alert("And here is some normal JS code"); // also colored
+</script>
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "application/x-ejs",
+        indentUnit: 4,
+        indentWithTabs: true,
+        enterMode: "keep",
+        tabMode: "shift"
+      });
+    </script>
+    <p>Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
+    JavaScript, CSS and XML.<br />Other dependancies include those of the scriping language chosen.</p>
+    <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET), 
+    <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
+  </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/htmlembedded
parent	fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent	053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
download	ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz

diff --git a/imports/codemirror/mode/htmlembedded/htmlembedded.js b/imports/codemirror/mode/htmlembedded/htmlembedded.js new file mode 100755 index 00000000..08e170ea --- /dev/null +++ b/imports/codemirror/mode/htmlembedded/htmlembedded.js
@@ -0,0 +1,68 @@
	1	CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
	2
	3	//config settings
	4	var scriptStartRegex = parserConfig.scriptStartRegex \|\| /^<%/i,
	5	scriptEndRegex = parserConfig.scriptEndRegex \|\| /^%>/i;
	6
	7	//inner modes
	8	var scriptingMode, htmlMixedMode;
	9
	10	//tokenizer when in html mode
	11	function htmlDispatch(stream, state) {
	12	if (stream.match(scriptStartRegex, false)) {
	13	state.token=scriptingDispatch;
	14	return scriptingMode.token(stream, state.scriptState);
	15	}
	16	else
	17	return htmlMixedMode.token(stream, state.htmlState);
	18	}
	19
	20	//tokenizer when in scripting mode
	21	function scriptingDispatch(stream, state) {
	22	if (stream.match(scriptEndRegex, false)) {
	23	state.token=htmlDispatch;
	24	return htmlMixedMode.token(stream, state.htmlState);
	25	}
	26	else
	27	return scriptingMode.token(stream, state.scriptState);
	28	}
	29
	30
	31	return {
	32	startState: function() {
	33	scriptingMode = scriptingMode \|\| CodeMirror.getMode(config, parserConfig.scriptingModeSpec);
	34	htmlMixedMode = htmlMixedMode \|\| CodeMirror.getMode(config, "htmlmixed");
	35	return {
	36	token : parserConfig.startOpen ? scriptingDispatch : htmlDispatch,
	37	htmlState : htmlMixedMode.startState(),
	38	scriptState : scriptingMode.startState()
	39	}
	40	},
	41
	42	token: function(stream, state) {
	43	return state.token(stream, state);
	44	},
	45
	46	indent: function(state, textAfter) {
	47	if (state.token == htmlDispatch)
	48	return htmlMixedMode.indent(state.htmlState, textAfter);
	49	else
	50	return scriptingMode.indent(state.scriptState, textAfter);
	51	},
	52
	53	copyState: function(state) {
	54	return {
	55	token : state.token,
	56	htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState),
	57	scriptState : CodeMirror.copyState(scriptingMode, state.scriptState)
	58	}
	59	},
	60
	61
	62	electricChars: "/{}:"
	63	}
	64	});
	65
	66	CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
	67	CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
	68	CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});


diff --git a/imports/codemirror/mode/htmlembedded/index.html b/imports/codemirror/mode/htmlembedded/index.html new file mode 100755 index 00000000..c1374e58 --- /dev/null +++ b/imports/codemirror/mode/htmlembedded/index.html
@@ -0,0 +1,49 @@
	1	<!doctype html>
	2	<html>
	3	<head>
	4	<title>CodeMirror: Html Embedded Scripts 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="../javascript/javascript.js"></script>
	9	<script src="../css/css.js"></script>
	10	<script src="../htmlmixed/htmlmixed.js"></script>
	11	<script src="htmlembedded.js"></script>
	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: Html Embedded Scripts mode</h1>
	17
	18	<form><textarea id="code" name="code">
	19	<%
	20	function hello(who) {
	21	return "Hello " + who;
	22	}
	23	%>
	24	This is an example of EJS (embedded javascript)
	25	<p>The program says <%= hello("world") %>.</p>
	26	<script>
	27	alert("And here is some normal JS code"); // also colored
	28	</script>
	29	</textarea></form>
	30
	31	<script>
	32	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
	33	lineNumbers: true,
	34	matchBrackets: true,
	35	mode: "application/x-ejs",
	36	indentUnit: 4,
	37	indentWithTabs: true,
	38	enterMode: "keep",
	39	tabMode: "shift"
	40	});
	41	</script>
	42
	43	<p>Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
	44	JavaScript, CSS and XML.<br />Other dependancies include those of the scriping language chosen.</p>
	45
	46	<p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET),
	47	<code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
	48	</body>
	49	</html>