oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-01 08:38:32 +00:00
Code Wiki Activity

3.5.172. Following tooltip now shows Creative hashtags. Bug fixes. Added several sidebar options.

Browse source
This commit is contained in:
SirStendec 2016-05-12 00:11:50 -04:00
parent 8056463bbe
commit 78fddccbb5
11 changed files with 315 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tokenize.js
View file

@ -794,7 +794,7 @@ FFZ.prototype.render_tokens = function(tokens, render_links, warn_links) {
// Creative Tags
// ---------------------
FFZ.prototype.tokenize_ctags = function(tokens) {
FFZ.prototype.tokenize_ctags = function(tokens, tags_only) {
"use strict";
if ( typeof tokens === "string" )
@ -812,7 +812,7 @@ FFZ.prototype.tokenize_ctags = function(tokens) {
if ( token.type === "text" )
token = token.text;
else {
new_tokens.push(token);
! tags_only && new_tokens.push(token);
continue;
}
@ -824,7 +824,7 @@ FFZ.prototype.tokenize_ctags = function(tokens) {
tag = segment.substr(1).toLowerCase();
if ( segment.charAt(0) === '#' && banned_tags.indexOf(tag) === -1 ) {
if ( text.length ) {
new_tokens.push({type: "text", text: text.join(' ') + ' '});
! tags_only && new_tokens.push({type: "text", text: text.join(' ') + ' '});
text = [];
}
@ -834,7 +834,7 @@ FFZ.prototype.tokenize_ctags = function(tokens) {
text.push(segment);
}
if ( text.length > 1 || (text.length === 1 && text[0] !== '') )
if ( ! tags_only && (text.length > 1 || (text.length === 1 && text[0] !== '')) )
new_tokens.push({type: "text", text: text.join(' ')});
}