Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-02 07:42:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve spoiler tag support

Browse Source 
Putting parentheses like this: (spoiler: test) now allows you to
designate a part of a line to be spoilered, instead of spoilering
everything to end-of-line. Yes, it's also possible to have
multiple spoilers on a line.

As a side effect, this also fixes the issue where spoilers messed
up modlogs by restricting them to one line.
This commit is contained in:
Guangcong Luo
2015-06-25 18:02:31 -04:00
parent c4129beef0
commit d923f047cd
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
js/battledata.js
View File

@@ -439,13 +439,37 @@ var Tools = {
options.hidebold ? '$1' : '<b>$1</b>');
if (!options.hidespoiler) {
var spoilerIndex = str.toLowerCase().indexOf('spoiler:');
if (spoilerIndex < 0) spoilerIndex = str.toLowerCase().indexOf('spoilers:');
if (spoilerIndex >= 0) {
var offset = spoilerIndex+8;
if (str.charAt(offset) === ':') offset++;
if (str.charAt(offset) === ' ') offset++;
str = str.substr(0, offset)+'<span class="spoiler">'+str.substr(offset)+'</span>';
var untilIndex = 0;
while (untilIndex < str.length) {
var spoilerIndex = str.toLowerCase().indexOf('spoiler:', untilIndex);
if (spoilerIndex < 0) spoilerIndex = str.toLowerCase().indexOf('spoilers:', untilIndex);
if (spoilerIndex >= 0) {
untilIndex = str.indexOf("\n", spoilerIndex);
if (untilIndex < 0) untilIndex = str.length;
if (str.charAt(spoilerIndex - 1) === '(') {
var nextLParenIndex = str.indexOf('(', spoilerIndex);
var nextRParenIndex = str.indexOf(')', spoilerIndex);
if (nextRParenIndex < 0 || nextRParenIndex >= untilIndex) {
// no `)`, keep spoilering until next newline
} else if (nextLParenIndex < 0 || nextLParenIndex > nextRParenIndex) {
// no `(` before next `)` - spoiler until next `)`
untilIndex = nextRParenIndex;
} else {
// `(` before next `)` - just spoiler until the last `)`
untilIndex = str.lastIndexOf(')', untilIndex);
if (untilIndex < 0) untilIndex = str.length; // should never happen
}
}
var offset = spoilerIndex + 8;
if (str.charAt(offset) === ':') offset++;
if (str.charAt(offset) === ' ') offset++;
str = str.slice(0, offset)+'<span class="spoiler">'+str.slice(offset, untilIndex)+'</span>'+str.slice(untilIndex);
untilIndex += 29;
} else {
break;
}
}
}