aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/xmlpure
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 16:17:54 -0800
committerValerio Virgillito2012-03-06 16:17:54 -0800
commitc2805e03c84b6e598556fd06d1ede7aaeea7ce9c (patch)
treeb033421762f5e0fedbc8700bfc1f175c7c5cabcf /imports/codemirror/mode/xmlpure
parent1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f (diff)
downloadninja-c2805e03c84b6e598556fd06d1ede7aaeea7ce9c.tar.gz
Squashed commit FileIO-Build-Candidate into Master
Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'imports/codemirror/mode/xmlpure')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/xmlpure/index.html0
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/xmlpure/xmlpure.js5
2 files changed, 5 insertions, 0 deletions
diff --git a/imports/codemirror/mode/xmlpure/index.html b/imports/codemirror/mode/xmlpure/index.html
index 721834ac..721834ac 100755..100644
--- a/imports/codemirror/mode/xmlpure/index.html
+++ b/imports/codemirror/mode/xmlpure/index.html
diff --git a/imports/codemirror/mode/xmlpure/xmlpure.js b/imports/codemirror/mode/xmlpure/xmlpure.js
index 6102f51d..18d710cf 100755..100644
--- a/imports/codemirror/mode/xmlpure/xmlpure.js
+++ b/imports/codemirror/mode/xmlpure/xmlpure.js
@@ -15,6 +15,7 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) {
15 var STYLE_ATTRIBUTE = "attribute"; 15 var STYLE_ATTRIBUTE = "attribute";
16 var STYLE_WORD = "string"; 16 var STYLE_WORD = "string";
17 var STYLE_TEXT = "atom"; 17 var STYLE_TEXT = "atom";
18 var STYLE_ENTITIES = "string";
18 19
19 var TAG_INSTRUCTION = "!instruction"; 20 var TAG_INSTRUCTION = "!instruction";
20 var TAG_CDATA = "!cdata"; 21 var TAG_CDATA = "!cdata";
@@ -290,6 +291,10 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) {
290 state.tokenize = parseElementTagName; 291 state.tokenize = parseElementTagName;
291 return STYLE_ELEMENT_NAME; 292 return STYLE_ELEMENT_NAME;
292 } 293 }
294 } else if(stream.eat("&")) {
295 stream.eatWhile(/[^;]/);
296 stream.eat(";");
297 return STYLE_ENTITIES;
293 } else { 298 } else {
294 // new context: text 299 // new context: text
295 pushContext(state, TAG_TEXT); 300 pushContext(state, TAG_TEXT);