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 f64ee2f OPENMEETINGS-2338 Fix reset of values in browser when
re-entering room (#73)
f64ee2f is described below
commit f64ee2f4594626ab1183eae2b93a19d3e45f275d
Author: Sebastian Wagner <sebawag...@apache.org>
AuthorDate: Sat May 2 15:44:13 2020 +1200
OPENMEETINGS-2338 Fix reset of values in browser when re-entering room (#73)
* OPENMEETINGS-2338 Fix reset of values in browser when re-entering room
* OPENMEETINGS-2338 Fix typo on word STOPPED.
* OPENMEETINGS-2338 fix accidental temporary file being committed.
---
.../org/apache/openmeetings/web/room/raw-sharer.js | 19 ++++++++++++++-----
.../apache/openmeetings/web/room/raw-video-manager.js | 4 ++--
.../org/apache/openmeetings/web/room/raw-video.js | 4 ++--
3 files changed, 18 insertions(+), 9 deletions(-)
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..de832c6 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_STOPPED = 'stopped';
var Sharer = (function() {
const self = {};
let sharer, type, fps, sbtn, rbtn, width, height
- , shareState = SHARE_STOPED, recState = SHARE_STOPED;
+ , shareState = SHARE_STOPPED, recState = SHARE_STOPPED;
+ /**
+ * Re-entering the room should reset settings.
+ */
+ function reset() {
+ shareState = SHARE_STOPPED;
+ recState = SHARE_STOPPED;
+ }
+
function _init() {
+ reset();
sharer = $('#sharer').dialog({
classes: {
'ui-dialog': 'sharer'
@@ -26,7 +35,7 @@ var Sharer = (function() {
fps = sharer.find('select.fps');
_disable(fps, VideoUtil.isEdge(b));
sbtn =
sharer.find('.share-start-stop').off().click(function() {
- if (shareState === SHARE_STOPED) {
+ if (shareState === SHARE_STOPPED) {
_setShareState(SHARE_STARTING);
VideoManager.sendMessage({
id: 'wannaShare'
@@ -47,7 +56,7 @@ var Sharer = (function() {
rbtn = sharer.find('.record-start-stop').off();
if (Room.getOptions().allowRecording) {
rbtn.show().click(function() {
- if (recState === SHARE_STOPED) {
+ if (recState === SHARE_STOPPED) {
_setRecState(SHARE_STARTING);
VideoManager.sendMessage({
id: 'wannaRecord'
@@ -81,7 +90,7 @@ var Sharer = (function() {
return VideoUtil.isEdge(b) || VideoUtil.isChrome(b);
}
function _setBtnState(btn, state) {
- const dis = SHARE_STOPED !== state
+ const dis = SHARE_STOPPED !== state
, typeDis = _typeDisabled();
_disable(type, dis);
_disable(fps, dis || typeDis);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
index b6a1652..6ee6bf1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
@@ -51,8 +51,8 @@ var VideoManager = (function() {
// Update activities in the current data object
v.stream().activities = sd.activities;
}
- Sharer.setShareState(VideoUtil.isSharing(sd) ? SHARE_STARTED :
SHARE_STOPED);
- Sharer.setRecState(VideoUtil.isRecording(sd) ? SHARE_STARTED :
SHARE_STOPED);
+ Sharer.setShareState(VideoUtil.isSharing(sd) ? SHARE_STARTED :
SHARE_STOPPED);
+ Sharer.setRecState(VideoUtil.isRecording(sd) ? SHARE_STARTED :
SHARE_STOPPED);
}
function _onReceive(msg) {
const uid = msg.stream.uid;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 505f931..e0ccb33 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -22,8 +22,8 @@ var Video = (function() {
function _getScreenStream(msg, callback) {
function __handleScreenError(err) {
VideoManager.sendMessage({id: 'errorSharing'});
- Sharer.setShareState(SHARE_STOPED);
- Sharer.setRecState(SHARE_STOPED);
+ Sharer.setShareState(SHARE_STOPPED);
+ Sharer.setRecState(SHARE_STOPPED);
OmUtil.error(err);
}
const b = kurentoUtils.WebRtcPeer.browser;
