summaryrefslogtreecommitdiffstats
path: root/infrastructure/ace/www/ace2_inner.js
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-03-25 17:53:24 +0100
committerEgil Moeller <egil.moller@freecode.no>2010-03-25 17:53:24 +0100
commitb897b18b9cb727f277a41ba12349548fe854d724 (patch)
treed49b2f9da7dd9bd2e6d590a1536ff48576914e7f /infrastructure/ace/www/ace2_inner.js
parente19fc9f24ab128d4337d67d0e3f312a1ab0be38b (diff)
downloadetherpad-b897b18b9cb727f277a41ba12349548fe854d724.tar.gz
etherpad-b897b18b9cb727f277a41ba12349548fe854d724.tar.bz2
etherpad-b897b18b9cb727f277a41ba12349548fe854d724.zip
Added support for plugins in the ACE linefilter
Diffstat (limited to 'infrastructure/ace/www/ace2_inner.js')
-rw-r--r--infrastructure/ace/www/ace2_inner.js10
1 files changed, 1 insertions, 9 deletions
diff --git a/infrastructure/ace/www/ace2_inner.js b/infrastructure/ace/www/ace2_inner.js
index afd1e35..e817c95 100644
--- a/infrastructure/ace/www/ace2_inner.js
+++ b/infrastructure/ace/www/ace2_inner.js
@@ -1139,15 +1139,7 @@ function OUTER(gscope) {
}
else {
var offsetIntoLine = 0;
- var filteredFunc = textAndClassFunc;
- filteredFunc = linestylefilter.getURLFilter(text, filteredFunc);
- if (browser.msie) {
- // IE7+ will take an e-mail address like <foo@bar.com> and linkify it to foo@bar.com.
- // We then normalize it back to text with no angle brackets. It's weird. So always
- // break spans at an "at" sign.
- filteredFunc = linestylefilter.getAtSignSplitterFilter(
- text, filteredFunc);
- }
+ var filteredFunc = linestylefilter.getFilterStack(text, textAndClassFunc, browser);
var lineNum = rep.lines.indexOfEntry(lineEntry);
var aline = rep.alines[lineNum];
filteredFunc = linestylefilter.getLineStyleFilter(