Merge branch 'master' into production

src/components/ChatMessage.jsx

@@ -49,50 +49,47 @@ function ChatMessage({
 
   return (
     <li className="chatmsg">
-      <div className="chatname">
+      {(!isInfo && !isEvent)
-        {
-        (!isInfo && !isEvent)
         && (
-          <>
+          <div className="chathead">
-            <img
+            <span className="chatname">
-              alt=""
+              <img
-              title={country}
+                alt=""
-              src={`${window.ssv.assetserver}/cf/${country}.gif`}
+                title={country}
-              onError={(e) => {
+                src={`${window.ssv.assetserver}/cf/${country}.gif`}
-                e.target.onerror = null;
+                onError={(e) => {
-                e.target.src = './cf/xx.gif';
+                  e.target.onerror = null;
-              }}
+                  e.target.src = './cf/xx.gif';
-            />
+                }}
-            &nbsp;
+              />
-            <span
+              &nbsp;
-              style={{
+              <span
-                color: setBrightness(colorFromText(name), isDarkMode),
+                style={{
-                cursor: 'pointer',
+                  color: setBrightness(colorFromText(name), isDarkMode),
-              }}
+                  cursor: 'pointer',
-              role="button"
+                }}
-              tabIndex={-1}
+                role="button"
-              onClick={(event) => {
+                tabIndex={-1}
-                const {
+                onClick={(event) => {
-                  clientX,
+                  const {
-                  clientY,
+                    clientX,
-                } = event;
+                    clientY,
-                dispatch(showContextMenu('USER', clientX, clientY, {
+                  } = event;
-                  windowId,
+                  dispatch(showContextMenu('USER', clientX, clientY, {
-                  uid,
+                    windowId,
-                  name,
+                    uid,
-                }));
+                    name,
-              }}
+                  }));
-            >
+                }}
-              {name}
+              >
+                {name}
+              </span>:
             </span>
-            :&nbsp;
             <span className="chatts">
               {getDateTimeString(ts)}
             </span>
-          </>
+          </div>
-        )
+        )}
-      }
-      </div>
       <div className={className}>
         <MarkdownParagraph pArray={pArray} />
       </div>

src/core/MarkdownParser.js

@@ -369,7 +369,6 @@ function parseOpts(inOpts) {
 export function parseParagraph(text, inOpts) {
   const opts = parseOpts(inOpts);
   const mText = new MString(text);
-  console.log('parse', text);
   return parseMParagraph(mText, opts);
 }
 

src/styles/default.css

@@ -664,10 +664,12 @@ tr:nth-child(even) {
   height: 24px;
   white-space: nowrap;
 }
+.chathead {
+  display: flex;
+}
 .chatname {
   font-size: 13px;
   white-space: nowrap;
-  display: flex;
 }
 .chatts {
   color: #83839f;