summaryrefslogtreecommitdiffstats
path: root/trunk/infrastructure/ace/www/ace2_inner.js
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-03-12 21:31:50 +0100
committerEgil Moeller <egil.moller@freecode.no>2010-03-12 21:31:50 +0100
commite59ca3a22a5be5dea265e58b67f93973b60f7ed9 (patch)
tree202ef5d7060f50f95a4bb32dfa24f1e8df075077 /trunk/infrastructure/ace/www/ace2_inner.js
parentfaae6d36cc92aae7c040146edb8471fa8e8c6a75 (diff)
downloadetherpad-e59ca3a22a5be5dea265e58b67f93973b60f7ed9.tar.gz
etherpad-e59ca3a22a5be5dea265e58b67f93973b60f7ed9.tar.bz2
etherpad-e59ca3a22a5be5dea265e58b67f93973b60f7ed9.zip
Cleaned up the taglinking code a bit
Diffstat (limited to 'trunk/infrastructure/ace/www/ace2_inner.js')
-rw-r--r--trunk/infrastructure/ace/www/ace2_inner.js11
1 files changed, 1 insertions, 10 deletions
diff --git a/trunk/infrastructure/ace/www/ace2_inner.js b/trunk/infrastructure/ace/www/ace2_inner.js
index eccb53c..e817c95 100644
--- a/trunk/infrastructure/ace/www/ace2_inner.js
+++ b/trunk/infrastructure/ace/www/ace2_inner.js
@@ -1139,16 +1139,7 @@ function OUTER(gscope) {
}
else {
var offsetIntoLine = 0;
- var filteredFunc = textAndClassFunc;
- filteredFunc = linestylefilter.getPadTagFilter(text, filteredFunc);
- 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(