You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2020/05/01 22:48:30 UTC
[openmeetings] branch
feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer
created (now 77d153f)
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a change to branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
at 77d153f OPENMEETINGS-2338 Fix reset of values in browser when re-entering room
This branch includes the following new commits:
new 77d153f OPENMEETINGS-2338 Fix reset of values in browser when re-entering room
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[openmeetings] 01/01: OPENMEETINGS-2338 Fix reset of values in
browser when re-entering room
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch feature/OPENMEETINGS-2338-re-enter-room-remembers-javascript-values-for-sharer
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 77d153fe5c4b62c59f42423aa39316a061082108
Author: Sebastian Wagner <se...@apache.org>
AuthorDate: Sat May 2 10:47:48 2020 +1200
OPENMEETINGS-2338 Fix reset of values in browser when re-entering room
---
.../current_openmeetings_context_name_IS_UNDEFINED.log | 0
.../main/java/org/apache/openmeetings/web/room/raw-sharer.js | 11 ++++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/current_openmeetings_log_dir_IS_UNDEFINED/current_openmeetings_context_name_IS_UNDEFINED.log b/openmeetings-web/current_openmeetings_log_dir_IS_UNDEFINED/current_openmeetings_context_name_IS_UNDEFINED.log
new file mode 100644
index 0000000..e69de29
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
index 646144b..0fc8b54 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-sharer.js
@@ -1,13 +1,22 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
var SHARE_STARTING = 'starting';
var SHARE_STARTED = 'started';
-var SHARE_STOPED = 'stoped';
+var SHARE_STOPED = 'stopped';
var Sharer = (function() {
const self = {};
let sharer, type, fps, sbtn, rbtn, width, height
, shareState = SHARE_STOPED, recState = SHARE_STOPED;
+ /**
+ * Re-entering the room should reset settings.
+ */
+ function reset() {
+ shareState = SHARE_STOPED;
+ recState = SHARE_STOPED;
+ }
+
function _init() {
+ reset();
sharer = $('#sharer').dialog({
classes: {
'ui-dialog': 'sharer'