From c2805e03c84b6e598556fd06d1ede7aaeea7ce9c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 6 Mar 2012 16:17:54 -0800 Subject: 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 --- imports/codemirror/mode/xmlpure/index.html | 0 imports/codemirror/mode/xmlpure/xmlpure.js | 5 +++++ 2 files changed, 5 insertions(+) mode change 100755 => 100644 imports/codemirror/mode/xmlpure/index.html mode change 100755 => 100644 imports/codemirror/mode/xmlpure/xmlpure.js (limited to 'imports/codemirror/mode/xmlpure') diff --git a/imports/codemirror/mode/xmlpure/index.html b/imports/codemirror/mode/xmlpure/index.html old mode 100755 new mode 100644 diff --git a/imports/codemirror/mode/xmlpure/xmlpure.js b/imports/codemirror/mode/xmlpure/xmlpure.js old mode 100755 new mode 100644 index 6102f51d..18d710cf --- a/imports/codemirror/mode/xmlpure/xmlpure.js +++ b/imports/codemirror/mode/xmlpure/xmlpure.js @@ -15,6 +15,7 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) { var STYLE_ATTRIBUTE = "attribute"; var STYLE_WORD = "string"; var STYLE_TEXT = "atom"; + var STYLE_ENTITIES = "string"; var TAG_INSTRUCTION = "!instruction"; var TAG_CDATA = "!cdata"; @@ -290,6 +291,10 @@ CodeMirror.defineMode("xmlpure", function(config, parserConfig) { state.tokenize = parseElementTagName; return STYLE_ELEMENT_NAME; } + } else if(stream.eat("&")) { + stream.eatWhile(/[^;]/); + stream.eat(";"); + return STYLE_ENTITIES; } else { // new context: text pushContext(state, TAG_TEXT); -- cgit v1.2.3