svn commit: r1785795 - 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

[solomax]

Author: solomax
Date: Tue Mar  7 05:18:55 2017
New Revision: 1785795

URL: http://svn.apache.org/viewvc?rev=1785795&view=rev
Log:
[OPENMEETINGS-1591] chat messages are displayed in right order

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=1785795&r1=1785794&r2=1785795&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:18:55 2017
@@ -140,9 +140,8 @@ var Chat = function() {
                                if (isClosed()) {
                                        $('#chat 
.control.block').addClass('ui-state-highlight');
                                }
-                               var msg;
-                               for (var i = 0; i < m.msg.length; ++i) {
-                                       var cm = m.msg[i];
+                               var msg, cm;
+                               while (!!(cm = m.msg.pop())) {
                                        msg = $(msgTemplate.replace(/#\{id\}/g, 
cm.id)
                                                        
.replace(/#\{userId\}/g, cm.from.id)
                                                        
.replace(/#\{imgSrc\}/g, cm.from.img)
@@ -166,10 +165,7 @@ var Chat = function() {
                                                $('#chat-msg-id-' + 
cm.id).remove();
                                        }
                                        msg.append(clearBlock);
-                                       $('#' + cm.scope).append(msg);
-                               }
-                               if (msg[0]) {
-                                       msg[0].scrollIntoView();
+                                       $('#' + cm.scope).prepend(msg);
                                }
                        }
                }

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=1785795&r1=1785794&r2=1785795&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:18:55 2017
@@ -140,9 +140,8 @@ var Chat = function() {
                                if (isClosed()) {
                                        $('#chat 
.control.block').addClass('ui-state-highlight');
                                }
-                               var msg;
-                               for (var i = 0; i < m.msg.length; ++i) {
-                                       var cm = m.msg[i];
+                               var msg, cm;
+                               while (!!(cm = m.msg.pop())) {
                                        msg = $(msgTemplate.replace(/#\{id\}/g, 
cm.id)
                                                        
.replace(/#\{userId\}/g, cm.from.id)
                                                        
.replace(/#\{imgSrc\}/g, cm.from.img)
@@ -166,10 +165,7 @@ var Chat = function() {
                                                $('#chat-msg-id-' + 
cm.id).remove();
                                        }
                                        msg.append(clearBlock);
-                                       $('#' + cm.scope).append(msg);
-                               }
-                               if (msg[0]) {
-                                       msg[0].scrollIntoView();
+                                       $('#' + cm.scope).prepend(msg);
                                }
                        }
                }