cleanup link preview rendering

night · Feb 17, 2017 · 207cc6d · 207cc6d
1 parent 7a92f88
commit 207cc6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/js/chat/image-preview.js b/src/js/chat/image-preview.js
diff --git a/src/js/chat/templates.js b/src/js/chat/templates.js
@@ -5,6 +5,8 @@ var tmi = require('./tmi'),
     regexUtils = require('../helpers/regex'),
     blacklistedEmoji = require('../helpers/emoji-blacklist.json');
 
+var imageTest = new RegExp('(https?:\/\/.)([a-z\-_0-9\/\:\.\%\+]*\.(jpg|jpeg|png|gif|gifv|webm))', 'i');
+
 var badge = exports.badge = function(type, name, description, action) {
     var classes = type + '' + (bttv.settings.get('alphaTags') ? ' alpha' + (!bttv.settings.get('darkenedMode') ? ' invert' : '') : '') + ' badge';
     return '<div class="' + classes + '" title="' + description + '"' + (action ? ' data-click-action="' + action + '"' : '') + '>' + name + '</div> ';
@@ -41,7 +43,8 @@ var linkify = exports.linkify = function(message) {
         if (/\x02/.test(e)) return e;
         if (e.indexOf('@') > -1 && (e.indexOf('/') === -1 || e.indexOf('@') < e.indexOf('/'))) return '<a href="mailto:' + e + '">' + e + '</a>';
         var link = e.replace(/^(?!(?:https?:\/\/|mailto:))/i, 'http://');
-        return '<a href="' + link + '" target="_blank">' + e + '</a>';
+        var isImage = bttv.settings.get('chatImagePreview') === true && imageTest.test(e);
+        return '<a href="' + link + '" ' + (isImage ? 'class="chat-preview" ' : '') + 'target="_blank">' + e + '</a>';
     });
 };
 
@@ -214,15 +217,6 @@ var bttvMessageTokenize = exports.bttvMessageTokenize = function(sender, message
     for (var i = 0; i < tokenizedString.length; i++) {
         var piece = tokenizedString[i];
 
-        if (bttv.settings.get('chatImagePreview') === true) {
-            var imageTest = new RegExp('(https?:\/\/.)([a-z\-_0-9\/\:\.\%\+]*\.(jpg|jpeg|png|gif|gifv|webm))', 'i');
-            if (imageTest.test(piece)) {
-                piece = bttv.chat.imagePreview(piece);
-                tokenizedString[i] = piece;
-                continue;
-            }
-        }
-
         var test = piece.replace(/(^[~!@#$%\^&\*\(\)]+|[~!@#$%\^&\*\(\)]+$)/g, '');
         var emote = null;