Skip to content

Commit 2dae95c

Browse files
whalefoodmarijnh
authored andcommitted
[HtmlEmbedded Mode] Couple of fixes an updated the main index page
1 parent fb72b7a commit 2dae95c

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ <h2 style="margin-top: 0">Supported modes:</h2>
4040
<li><a href="mode/coffeescript/index.html">CoffeeScript</a></li>
4141
<li><a href="mode/css/index.html">CSS</a></li>
4242
<li><a href="mode/diff/index.html">diff</a></li>
43-
<li><a href="mode/ejs/index.html">Ejs</a></li>
4443
<li><a href="mode/groovy/index.html">Groovy</a></li>
4544
<li><a href="mode/haskell/index.html">Haskell</a></li>
45+
<li><a href="mode/htmlembedded/index.html">HTML embedded scripts</a></li>
4646
<li><a href="mode/htmlmixed/index.html">HTML mixed-mode</a></li>
4747
<li><a href="mode/javascript/index.html">JavaScript</a></li>
4848
<li><a href="mode/jinja2/index.html">Jinja2</a></li>

mode/htmlembedded/htmlembedded.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
22

33
//config settings
44
var scriptStartRegex = parserConfig.scriptStartRegex || /^<%/i,
5-
scriptEndRegex = parserConfig.scriptEndRegex || /^%>/i,
6-
scriptingMode;
7-
8-
var htmlMixedMode = CodeMirror.getMode(config, "htmlmixed");
5+
scriptEndRegex = parserConfig.scriptEndRegex || /^%>/i;
6+
7+
//inner modes
8+
var scriptingMode, htmlMixedMode;
99

1010
//tokenizer when in html mode
1111
function htmlDispatch(stream, state) {
@@ -30,7 +30,8 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
3030

3131
return {
3232
startState: function() {
33-
scriptingMode = scriptingMode || CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
33+
scriptingMode = scriptingMode || CodeMirror.getMode(config, parserConfig.scriptingModeSpec);
34+
htmlMixedMode = htmlMixedMode || CodeMirror.getMode(config, "htmlmixed");
3435
return {
3536
token : parserConfig.startOpen ? scriptingDispatch : htmlDispatch,
3637
htmlState : htmlMixedMode.startState(),
@@ -65,8 +66,3 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
6566
CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
6667
CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
6768
CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
68-
/*CodeMirror.defineMIME("application/x-httpd-php", {
69-
name: "htmlembedded",
70-
scriptingModeSpec:"text/x-php",
71-
scriptStartRegex: /^<\?/,
72-
scriptEndRegex: /^\?>/});*/

0 commit comments

Comments
 (0)