Merge 4772640b96 into adc0ea27a9

Restores https://github.com/dailymotion/dailymotion-sdk-js commit 75b4102

player/dailymotion.coffee

@@ -18,7 +18,12 @@ window.DailymotionPlayer = class DailymotionPlayer extends Player
             if quality != 'auto'
                 params.quality = quality
 
-            @dm = DM.player('ytapiplayer',
+            @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,
                 video: data.id
                 width: parseInt(VWIDTH, 10)
                 height: parseInt(VHEIGHT, 10)

www/js/util.js

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