oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-29 15:55:33 +00:00
Code Wiki Activity

Blocking a couple link domains by default.

Browse source
This commit is contained in:
SirStendec 2015-08-09 01:29:06 -04:00
parent 771e290197
commit 315a91ab5c
5 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
script.js
View file

@ -4589,7 +4589,7 @@ FFZ.get_capitalization = function(name, callback) {
// --------------------- // ---------------------
FFZ.prototype._remove_banned = function(tokens) { FFZ.prototype._remove_banned = function(tokens) {
var banned_words = this.settings.banned_words; var banned_words = _.union(['j.mp', 'bit.ly'], this.settings.banned_words);
if ( ! banned_words || ! banned_words.length ) if ( ! banned_words || ! banned_words.length )
return tokens; return tokens;
@ -4612,10 +4612,6 @@ FFZ.prototype._remove_banned = function(tokens) {
isLong: false, isLong: false,
censoredHref: token.href.replace(regex, "$1***") censoredHref: token.href.replace(regex, "$1***")
}); });
/*{
mentionedUser: '</span><a class="deleted-link" title="' + utils.quote_attr(token.href.replace(regex, "$1***")) + '" data-url="' + utils.quote_attr(token.href) + '" href="#">&lt;banned link&gt;</a><span class="mentioning">',
own: true
});*/
else else
new_tokens.push(token); new_tokens.push(token);
@ -7574,7 +7570,7 @@ FFZ.get = function() { return FFZ.instance; }
// Version // Version
var VER = FFZ.version_info = { var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 12, major: 3, minor: 5, revision: 13,
toString: function() { toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
} }

4
script.min.js vendored
View file

File diff suppressed because one or more lines are too long

6
src/ember/line.js
View file

@ -824,7 +824,7 @@ FFZ.get_capitalization = function(name, callback) {
// --------------------- // ---------------------
FFZ.prototype._remove_banned = function(tokens) { FFZ.prototype._remove_banned = function(tokens) {
var banned_words = this.settings.banned_words; var banned_words = _.union(['j.mp', 'bit.ly'], this.settings.banned_words);
if ( ! banned_words || ! banned_words.length ) if ( ! banned_words || ! banned_words.length )
return tokens; return tokens;
@ -847,10 +847,6 @@ FFZ.prototype._remove_banned = function(tokens) {
isLong: false, isLong: false,
censoredHref: token.href.replace(regex, "$1***") censoredHref: token.href.replace(regex, "$1***")
}); });
/*{
mentionedUser: '</span><a class="deleted-link" title="' + utils.quote_attr(token.href.replace(regex, "$1***")) + '" data-url="' + utils.quote_attr(token.href) + '" href="#">&lt;banned link&gt;</a><span class="mentioning">',
own: true
});*/
else else
new_tokens.push(token); new_tokens.push(token);

2
src/main.js
View file

@ -21,7 +21,7 @@ FFZ.get = function() { return FFZ.instance; }
// Version // Version
var VER = FFZ.version_info = { var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 12, major: 3, minor: 5, revision: 13,
toString: function() { toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
} }

3
style.css
View file

@ -556,6 +556,9 @@ body:not(.ffz-minimal-chat):not(.ffz-menu-replace) .emoticon-selector-toggle + s
list-style-type: none; list-style-type: none;
border-top: 1px solid rgba(0,0,0,0.2); border-top: 1px solid rgba(0,0,0,0.2);
background-color: #eee; background-color: #eee;
}
.ffz-ui-popup ul.menu:not(.sub-menu) {
cursor: ew-resize; cursor: ew-resize;
} }