mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 20:55:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #471 from matrix-org/revert-460-fix-linkify

Browse source 
Revert "Fix linkification and bump linkifyjs dep"
This commit is contained in:
Matthew Hodgson 2016-09-13 19:36:58 +01:00 committed by GitHub
commit 7d7cb35e15
1 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/linkify-matrix.js
View file

@ -23,84 +23,76 @@ function matrixLinkify(linkify) {
var S_START = linkify.parser.start; var S_START = linkify.parser.start;
function ROOMALIAS(value) { var ROOMALIAS = function(value) {
this.v = value; MultiToken.call(this, value);
} this.type = 'roomalias';
linkify.inherits(MultiToken, ROOMALIAS, { this.isLink = true;
type: 'roomalias', };
isLink: true, ROOMALIAS.prototype = new MultiToken();
});
var S_HASH = S_START.jump(TT.POUND); var S_HASH = new linkify.parser.State();
var S_HASH_NAME = new linkify.parser.State(); var S_HASH_NAME = new linkify.parser.State();
var S_HASH_NAME_COLON = new linkify.parser.State(); var S_HASH_NAME_COLON = new linkify.parser.State();
var S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
var S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
var S_ROOMALIAS = new linkify.parser.State(ROOMALIAS); var S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
// WTF!? It is absolutely crazy that these have to be listed out this way,
// TT.DOMAIN should've covered all of them!
const localpart_tokens = [
TT.DOMAIN,
TT.TLD,
TT.LOCALHOST,
TT.NUM,
TT.UNDERSCORE,
];
var roomname_tokens = [ var roomname_tokens = [
TT.POUND,
TT.UNDERSCORE,
TT.DOT, TT.DOT,
TT.PLUS, TT.PLUS,
TT.NUM, TT.NUM,
TT.DOMAIN, TT.DOMAIN,
TT.LOCALHOST TT.TLD
]; ];
S_START.on(TT.POUND, S_HASH); S_START.on(TT.POUND, S_HASH);
S_HASH.on(roomname_tokens, S_HASH_NAME); S_HASH.on(roomname_tokens, S_HASH_NAME);
S_HASH_NAME.on(roomname_tokens, S_HASH_NAME); S_HASH_NAME.on(roomname_tokens, S_HASH_NAME);
S_HASH_NAME.on(TT.DOMAIN, S_HASH_NAME);
S_HASH_NAME.on(TT.COLON, S_HASH_NAME_COLON); S_HASH_NAME.on(TT.COLON, S_HASH_NAME_COLON);
S_HASH_NAME_COLON.on(localpart_tokens, S_ROOMALIAS); S_HASH_NAME_COLON.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN);
S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON); S_HASH_NAME_COLON_DOMAIN.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT);
S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_HASH_NAME_COLON_DOMAIN);
S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS);
var USERID = function(value) { var USERID = function(value) {
this.v = value; MultiToken.call(this, value);
this.type = 'userid';
this.isLink = true;
}; };
linkify.inherits(MultiToken, USERID, { USERID.prototype = new MultiToken();
type: 'userid',
isLink: true,
});
var S_AT = new linkify.parser.State(); var S_AT = new linkify.parser.State();
var S_AT_NAME = new linkify.parser.State(); var S_AT_NAME = new linkify.parser.State();
var S_AT_NAME_COLON = new linkify.parser.State(); var S_AT_NAME_COLON = new linkify.parser.State();
var S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
var S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); var S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
var S_USERID = new linkify.parser.State(USERID); var S_USERID = new linkify.parser.State(USERID);
var username_tokens = [ var username_tokens = [
TT.DOT, TT.DOT,
TT.UNDERSCORE,
TT.PLUS, TT.PLUS,
TT.NUM, TT.NUM,
TT.DOMAIN, TT.DOMAIN,
TT.TLD, TT.TLD
TT.LOCALHOST,
]; ];
S_START.on(TT.AT, S_AT); S_START.on(TT.AT, S_AT);
S_AT.on(username_tokens, S_AT_NAME); S_AT.on(username_tokens, S_AT_NAME);
S_AT_NAME.on(username_tokens, S_AT_NAME); S_AT_NAME.on(username_tokens, S_AT_NAME);
S_AT_NAME.on(TT.DOMAIN, S_AT_NAME);
S_AT_NAME.on(TT.COLON, S_AT_NAME_COLON); S_AT_NAME.on(TT.COLON, S_AT_NAME_COLON);
S_AT_NAME_COLON.on(localpart_tokens, S_USERID); S_AT_NAME_COLON.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN);
S_USERID.on(TT.DOT, S_AT_NAME_COLON); S_AT_NAME_COLON_DOMAIN.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT);
S_AT_NAME_COLON_DOMAIN_DOT.on(TT.DOMAIN, S_AT_NAME_COLON_DOMAIN);
S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID);
} }
// stubs, overwritten in MatrixChat's componentDidMount // stubs, overwritten in MatrixChat's componentDidMount