From 28c8d4c3df1fb71ca2e72418c3dbc32a406e109d Mon Sep 17 00:00:00 2001 From: BoboTiG Date: Tue, 26 Apr 2016 15:24:49 +0200 Subject: [PATCH 1/3] Fixes #154: cannot render emoji inside a table --- src/emojify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emojify.js b/src/emojify.js index 99213e80..a5c548f6 100644 --- a/src/emojify.js +++ b/src/emojify.js @@ -306,7 +306,7 @@ var nodes = []; - var elementsBlacklist = new RegExp(defaultConfig.blacklist.elements.join('|'), 'i'), + var elementsBlacklist = new RegExp('^(' + defaultConfig.blacklist.elements.join('|') + ')$', 'i'), classesBlacklist = new RegExp(defaultConfig.blacklist.classes.join('|'), 'i'); if(typeof win.document.createTreeWalker !== 'undefined') { @@ -314,7 +314,7 @@ el, win.NodeFilter.SHOW_TEXT | win.NodeFilter.SHOW_ELEMENT, function(node) { - if(node.nodeType !== 1) { + if(node.nodeType === node.TEXT_NODE) { /* Text Node? Good! */ return win.NodeFilter.FILTER_ACCEPT; } From ab79abb28240cb1de600f6abe0928fd57befdba6 Mon Sep 17 00:00:00 2001 From: BoboTiG Date: Tue, 26 Apr 2016 15:30:00 +0200 Subject: [PATCH 2/3] Use the constant node.TEXT_NODE --- src/emojify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emojify.js b/src/emojify.js index a5c548f6..21d4c399 100644 --- a/src/emojify.js +++ b/src/emojify.js @@ -342,7 +342,7 @@ ){ return false; } - if (node.nodeType === 1) { + if (node.nodeType === node.TEXT_NODE) { return true; } From c6226d2d5238a93f38cdbfd09132aa5bd5fc462a Mon Sep 17 00:00:00 2001 From: BoboTiG Date: Tue, 26 Apr 2016 16:07:22 +0200 Subject: [PATCH 3/3] Fix introduced errors. Tests OK. --- src/emojify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emojify.js b/src/emojify.js index 21d4c399..c0a3a3c6 100644 --- a/src/emojify.js +++ b/src/emojify.js @@ -314,7 +314,7 @@ el, win.NodeFilter.SHOW_TEXT | win.NodeFilter.SHOW_ELEMENT, function(node) { - if(node.nodeType === node.TEXT_NODE) { + if(node.nodeType !== node.ELEMENT_NODE) { /* Text Node? Good! */ return win.NodeFilter.FILTER_ACCEPT; } @@ -342,7 +342,7 @@ ){ return false; } - if (node.nodeType === node.TEXT_NODE) { + if (node.nodeType === node.ELEMENT_NODE) { return true; }