Merge d41a3d1ece into 227244e2d0

player/dailymotion.coffee

@@ -18,12 +18,7 @@ window.DailymotionPlayer = class DailymotionPlayer extends Player
             if quality != 'auto'
                 params.quality = quality
 
-            @element = DM.$('ytapiplayer')
-            if not @element or @element.nodeType != Node.ELEMENT_NODE
-                throw new Error("Invalid player element in DailymotionPlayer(), requires an existing HTML element: " + @element)
-            if DM.Player._INSTANCES[@element.id] != undefined
-                @element = DM.Player.destroy(@element.id)
-            @dm = DM.Player.create(@element,
+            @dm = DM.player('ytapiplayer',
                 video: data.id
                 width: parseInt(VWIDTH, 10)
                 height: parseInt(VHEIGHT, 10)

www/js/util.js

@@ -2702,7 +2702,8 @@ function execEmotes(msg) {
     }
 
     CHANNEL.emotes.forEach(function (e) {
-        msg = msg.replace(e.regex, '$1' + emoteToImg(e).outerHTML);
+        msg = msg.replace(e.regex, '$1<img class="channel-emote" src="' +
+                                   e.image + '" title="' + e.name + '">');
     });
 
     return msg;
@@ -2710,12 +2711,13 @@ function execEmotes(msg) {
 
 function execEmotesEfficient(msg) {
     CHANNEL.badEmotes.forEach(function (e) {
-        msg = msg.replace(e.regex, '$1' + emoteToImg(e).outerHTML);
+        msg = msg.replace(e.regex, '$1<img class="channel-emote" src="' +
+                          e.image + '" title="' + e.name + '">');
     });
     msg = msg.replace(/[^\s]+/g, function (m) {
         if (CHANNEL.emoteMap.hasOwnProperty(m)) {
             var e = CHANNEL.emoteMap[m];
-            return emoteToImg(e).outerHTML;
+            return '<img class="channel-emote" src="' + e.image + '" title="' + e.name + '">';
         } else {
             return m;
         }
@@ -2723,14 +2725,6 @@ function execEmotesEfficient(msg) {
     return msg;
 }
 
-function emoteToImg(e) {
-    var img = document.createElement('img');
-    img.className = 'channel-emote';
-    img.title = e.name;
-    img.src = e.image;
-    return img;
-}
-
 function initPm(user) {
     if ($("#pm-" + user).length > 0) {
         return $("#pm-" + user);