From ffbca7b85198c2d0efd71b95ef4a1fa693578af0 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 11 Jan 2015 23:01:14 -0800
Subject: Factored out unescapeString into new module, js/common.js.

This is used in both blocks.js and inlines.js.
---
 js/lib/inlines.js | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'js/lib/inlines.js')

diff --git a/js/lib/inlines.js b/js/lib/inlines.js
index bcb9ee8..5e87074 100644
--- a/js/lib/inlines.js
+++ b/js/lib/inlines.js
@@ -1,4 +1,5 @@
 var Node = require('./node');
+var unescapeString = require('./common').unescapeString;
 
 var fromCodePoint = require('./from-code-point.js');
 var entityToChar = require('./html5-entities.js').entityToChar;
@@ -63,10 +64,6 @@ var reEscapable = new RegExp(ESCAPABLE);
 
 var reEntityHere = new RegExp('^' + ENTITY, 'i');
 
-var reEntityOrEscapedChar = new RegExp('\\\\' + ESCAPABLE + '|' + ENTITY, 'gi');
-
-var reBackslashOrAmp = /[\\&]/;
-
 var reTicks = new RegExp('`+');
 
 var reTicksHere = new RegExp('^`+');
@@ -92,25 +89,6 @@ var reLinkLabel = /^\[(?:[^\\\[\]]|\\[\[\]]){0,1000}\]/;
 // Matches a string of non-special characters.
 var reMain = /^[^\n`\[\]\\!<&*_]+/m;
 
-var unescapeChar = function(s) {
-    "use strict";
-    if (s[0] === '\\') {
-        return s[1];
-    } else {
-        return entityToChar(s);
-    }
-};
-
-// Replace entities and backslash escapes with literal characters.
-var unescapeString = function(s) {
-    "use strict";
-    if (reBackslashOrAmp.test(s)) {
-        return s.replace(reEntityOrEscapedChar, unescapeChar);
-    } else {
-        return s;
-    }
-};
-
 // Normalize reference label: collapse internal whitespace
 // to single space, remove leading/trailing whitespace, case fold.
 var normalizeReference = function(s) {
@@ -859,7 +837,6 @@ function InlineParser(){
         match: match,
         peek: peek,
         spnl: spnl,
-        unescapeString: unescapeString,
         parseBackticks: parseBackticks,
         parseBackslash: parseBackslash,
         parseAutolink: parseAutolink,
-- 
cgit v1.2.3