diff options
author | Egil Moeller <egil.moller@freecode.no> | 2010-03-12 21:25:15 +0100 |
---|---|---|
committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-12 21:25:15 +0100 |
commit | faae6d36cc92aae7c040146edb8471fa8e8c6a75 (patch) | |
tree | 40ce0e6a8c1959ba288a1a130243687b2ed98a45 /trunk/infrastructure/ace/www/linestylefilter.js | |
parent | 2d8d9afeb01df0772661348321974627d42c8850 (diff) | |
download | etherpad-faae6d36cc92aae7c040146edb8471fa8e8c6a75.tar.gz etherpad-faae6d36cc92aae7c040146edb8471fa8e8c6a75.tar.xz etherpad-faae6d36cc92aae7c040146edb8471fa8e8c6a75.zip |
Tags are now shown as links
Diffstat (limited to 'trunk/infrastructure/ace/www/linestylefilter.js')
-rw-r--r-- | trunk/infrastructure/ace/www/linestylefilter.js | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/trunk/infrastructure/ace/www/linestylefilter.js b/trunk/infrastructure/ace/www/linestylefilter.js index 0ac578b..8c7c396 100644 --- a/trunk/infrastructure/ace/www/linestylefilter.js +++ b/trunk/infrastructure/ace/www/linestylefilter.js @@ -185,6 +185,55 @@ linestylefilter.getURLFilter = function(lineText, textAndClassFunc) { splitPoints); }; +/* Copy of getURLFilter with slight modifications, should probably merge and just use different regexps */ +linestylefilter.REGEX_PADTAG = new RegExp("#[^,#!\\s][^,#!\\s]*", "g"); + +linestylefilter.getPadTagFilter = function(lineText, textAndClassFunc) { + linestylefilter.REGEX_PADTAG.lastIndex = 0; + var padTags = null; + var splitPoints = null; + var execResult; + while ((execResult = linestylefilter.REGEX_PADTAG.exec(lineText))) { + if (! padTags) { + padTags = []; + splitPoints = []; + } + var startIndex = execResult.index; + var padTag = execResult[0]; + padTags.push([startIndex, padTag]); + splitPoints.push(startIndex, startIndex + padTag.length); + } + + if (! padTags) return textAndClassFunc; + + function padTagForIndex(idx) { + for(var k=0; k<padTags.length; k++) { + var u = padTags[k]; + if (idx >= u[0] && idx < u[0]+u[1].length) { + return u[1]; + } + } + return false; + } + + var handlePadTagsAfterSplit = (function() { + var curIndex = 0; + return function(txt, cls) { + var txtlen = txt.length; + var newCls = cls; + var padTag = padTagForIndex(curIndex); + if (padTag) { + newCls += " padtag:"+padTag.substring(1); + } + textAndClassFunc(txt, newCls); + curIndex += txtlen; + }; + })(); + + return linestylefilter.textAndClassFuncSplitter(handlePadTagsAfterSplit, + splitPoints); +} + linestylefilter.textAndClassFuncSplitter = function(func, splitPointsOpt) { var nextPointIndex = 0; var idx = 0; @@ -241,6 +290,7 @@ linestylefilter.populateDomLine = function(textLine, aline, apool, var func = textAndClassFunc; func = linestylefilter.getURLFilter(text, func); + func = linestylefilter.getPadTagFilter(text, func); func = linestylefilter.getLineStyleFilter(text.length, aline, func, apool); func(text, ''); |