[openmeetings] branch master updated: [OPENMEETINGS-1820] emoticons animate is extracted to be separate function

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new e6372f7  [OPENMEETINGS-1820] emoticons animate is extracted to be separate function
e6372f7 is described below

commit e6372f70a9bb9069203071b20d07d9c62f37d5f2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Feb 2 13:23:07 2018 +0700

    [OPENMEETINGS-1820] emoticons animate is extracted to be separate function
---
 .../main/java/org/apache/openmeetings/web/user/chat/chat-base.js  | 4 +++-
 .../java/org/apache/openmeetings/web/user/chat/cssemoticons.js    | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
index fe171f6..b41224c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
@@ -70,7 +70,7 @@ var Chat = function() {
 		let row = $('<tr></tr>');
 		for (let i = 0; i < emots.length; ++i) {
 			row.append($('<td>').append(
-					$('<div>').addClass('emt').html(emoticon.emoticonize(emots[i], {animate: false}))
+					$('<div>').addClass('emt').html(emoticon.emoticonize(emots[i]))
 						.data('emt', emots[i]).click(function() {Chat.emtClick($(this).data('emt'));})
 				));
 			if (i !== 0 && i % rowSize === 0) {
@@ -104,6 +104,7 @@ var Chat = function() {
 		$('#chat #hyperlink').parent().find('button').off().click(function() {
 			_insertLink();
 		});
+		emoticon.animate();
 	}
 	function isClosed() {
 		return p.hasClass('closed');
@@ -260,6 +261,7 @@ var Chat = function() {
 					_scrollDown(area);
 				}
 			}
+			emoticon.animate();
 		}
 	}
 	function _setOpened() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js
index f4d9fa4..a7e2c4d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js
@@ -71,7 +71,6 @@ var CSSEmoticon = function() {
 
 	this.defaults = {animate: true, delay: 500, exclude: 'pre,code,.no-emoticons'}
 };
-
 CSSEmoticon.prototype.emoticonize = function(str, options) {
 	const opts = $.extend({}, this.defaults, options);
 
@@ -94,13 +93,14 @@ CSSEmoticon.prototype.emoticonize = function(str, options) {
 		const regexp = this.twoCharacterEmoticons[key];
 		str = str.replace(regexp, "$1<span class='" + cssClass + " spaced-emoticon'>$2</span>");
 	}
-
+	return str;
+};
+CSSEmoticon.prototype.animate = function(options) {
+	const opts = $.extend({}, this.defaults, options);
 	// animate emoticons
 	if (opts.animate) {
 		setTimeout(function () {
 			$('.un-transformed-emoticon').removeClass('un-transformed-emoticon');
 		}, opts.delay);
 	}
-
-	return str;
 };

-- 
To stop receiving notification emails like this one, please contact
solomax@apache.org.