You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/03/07 05:45:39 UTC
svn commit: r1785797 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Author: solomax
Date: Tue Mar 7 05:45:39 2017
New Revision: 1785797
URL: http://svn.apache.org/viewvc?rev=1785797&view=rev
Log:
[OPENMEETINGS-1592] general avatar is displayed for mobile users
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1785797&r1=1785796&r2=1785797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js Tue Mar 7 05:45:39 2017
@@ -144,7 +144,7 @@ var Chat = function() {
while (!!(cm = m.msg.pop())) {
msg = $(msgTemplate.replace(/#\{id\}/g, cm.id)
.replace(/#\{userId\}/g, cm.from.id)
- .replace(/#\{imgSrc\}/g, cm.from.img)
+ .replace(/#\{imgSrc\}/g, !!cm.from.img ? cm.from.img : './profile/' + cm.from.id + '?anticache=' + Date.now())
.replace(/#\{from\}/g, cm.from.name)
.replace(/#\{sent\}/g, cm.sent)
.replace(/#\{msg\}/g, emoticon.emoticonize(!!cm.message ? cm.message : "")));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1785797&r1=1785796&r2=1785797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js Tue Mar 7 05:45:39 2017
@@ -144,7 +144,7 @@ var Chat = function() {
while (!!(cm = m.msg.pop())) {
msg = $(msgTemplate.replace(/#\{id\}/g, cm.id)
.replace(/#\{userId\}/g, cm.from.id)
- .replace(/#\{imgSrc\}/g, cm.from.img)
+ .replace(/#\{imgSrc\}/g, !!cm.from.img ? cm.from.img : './profile/' + cm.from.id + '?anticache=' + Date.now())
.replace(/#\{from\}/g, cm.from.name)
.replace(/#\{sent\}/g, cm.sent)
.replace(/#\{msg\}/g, emoticon.emoticonize(!!cm.message ? cm.message : "")));