Ticket #3409: t3409_v9.patch

trunk/binaries/data/mods/public/gui/common/functions_utility.js

@@ -56 +56 @@
 }
 
 /**
+ * This function is used that highlith player names in wide text
+ */
+function colorizePlayernamesInWideText(message,players,colorFunction)
+{
+    var colorizedNames = [];
+    var names = [];
+    var ret = "";
+
+    for (let id in players)
+    {
+        let player = players[id];
+        if (player.player > -1)
+        {
+            colorizedNames.push(colorFunction(id,""));
+            names.push(player.name);
+        }
+        else
+        {
+            colorizedNames.push(player.name);
+            names.push(player.name);
+        }
+    }
+
+    var tmpBuffer = "";
+    var fixedMessage = "";
+    for (let charIndex in message)
+    {
+        tmpBuffer += message[charIndex];
+
+        for (let nameIndex in names)
+        {
+            var beginCharIndex = tmpBuffer.indexOf(names[nameIndex]);
+            if (beginCharIndex != -1)
+            {
+                var leftPartBuffer = tmpBuffer.substr(0, beginCharIndex);
+                fixedMessage += escapeText(leftPartBuffer) + colorizedNames[nameIndex];
+                tmpBuffer = "";
+            }
+        }
+  }
+
+    if (tmpBuffer.length != 0)
+        fixedMessage += escapeText(tmpBuffer);
+
+    return fixedMessage;
+}
+
+/**
  * Escape tag start and escape characters, so users cannot use special formatting.
  * Also limit string length to 256 characters (not counting escape characters).
  */

trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -46 +46 @@
     "banned": (msg, user) => systemMessage(sprintf(translate("%(username)s has been banned"), { "username": user })),
     "chat": (msg, user) => sprintf(translate("%(username)s %(message)s"), {
         "username": senderFont(sprintf(translate("<%(username)s>"), { "username": user })),
-        "message": escapeText(msg.text || "")
+        "message": colorizePlayernamesInWideText(msg.text || "", g_PlayerAssignments,colorizePlayernameByGUID)
     }),
     "ready": (msg, user) => sprintf(translate("* %(username)s is ready!"), {
         "username": user

trunk/binaries/data/mods/public/gui/session/messages.js

@@ -645 +668 @@
         }
     }
     else
-        msg.text = escapeText(msg.text);
+        msg.text = colorizePlayernamesInWideText(msg.text, g_PlayerAssignments,colorizePlayernameByGUID);
 
     // GUID for players, playerID for AIs
     let coloredUsername = msg.guid != -1 ? colorizePlayernameByGUID(msg.guid) : colorizePlayernameByID(msg.player);