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/12/09 17:40:17 UTC
openmeetings git commit: [OPENMEETINGS-1778] only enter/exit a&a
messages are being auto cleaned
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x bf9832a1e -> 118591f57
[OPENMEETINGS-1778] only enter/exit a&a messages are being auto cleaned
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/118591f5
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/118591f5
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/118591f5
Branch: refs/heads/4.0.x
Commit: 118591f57496fc78d55973f6651aef7635ab1d8c
Parents: bf9832a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Dec 10 00:40:09 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Dec 10 00:40:09 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/room/activities/activities.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/118591f5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
index fcd30cc..0b49059 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
@@ -134,7 +134,7 @@ var Activities = function() {
a.find('.activity-close').click(function() { a.remove(); _action('close', obj.id); });
a.find('.activity-text').text(obj.text);
_hightlight();
- if (aclean.prop('checked')) {
+ if (aclean.prop('checked') && a.hasClass('auto-clean')) {
setTimeout(_clearItem.bind(null, obj.id), timeout);
}
}