Combine methods to enable and disable video

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

js/app.js

@@ -758,7 +758,7 @@
 			this.fullscreenDisabled = true;
 		},
 		enableVideo: function() {
-			if (!this._mediaControlsView.enableVideo()) {
+			if (!this._mediaControlsView.setVideoEnabled(true)) {
 				return;
 			}
 
@@ -769,7 +769,7 @@
 			localVideo.show();
 		},
 		disableVideo: function() {
-			if (!this._mediaControlsView.disableVideo()) {
+			if (!this._mediaControlsView.setVideoEnabled(false)) {
 				return;
 			}
 

js/embedded.js

@@ -204,7 +204,7 @@
 			}
 		},
 		enableVideo: function() {
-			if (!this._mediaControlsView.enableVideo()) {
+			if (!this._mediaControlsView.setVideoEnabled(true)) {
 				return;
 			}
 
@@ -215,7 +215,7 @@
 			localVideo.show();
 		},
 		disableVideo: function() {
-			if (!this._mediaControlsView.disableVideo()) {
+			if (!this._mediaControlsView.setVideoEnabled(false)) {
 				return;
 			}
 

js/views/mediacontrolsview.js

@@ -167,38 +167,30 @@
 			}
 		},
 
-		disableVideo: function() {
+		setVideoEnabled: function(videoEnabled) {
 			if (!this._videoAvailable || !this._webrtc) {
 				return false;
 			}
 
-			this._webrtc.pauseVideo();
+			if (videoEnabled) {
+				this._webrtc.resumeVideo();
 
-			this.getUI('videoButton').attr('data-original-title', t('spreed', 'Enable video (v)'))
-				.addClass('local-video-disabled video-disabled icon-video-off')
-				.removeClass('icon-video');
-			this.getUI('audioButton').addClass('local-video-disabled');
-			this.getUI('screensharingButton').addClass('local-video-disabled');
+				this.getUI('videoButton').attr('data-original-title', t('spreed', 'Disable video (v)'))
+					.removeClass('local-video-disabled video-disabled icon-video-off')
+					.addClass('icon-video');
+				this.getUI('audioButton').removeClass('local-video-disabled');
+				this.getUI('screensharingButton').removeClass('local-video-disabled');
+			} else {
+				this._webrtc.pauseVideo();
 
-			this.videoEnabled = false;
-
-			return true;
-		},
-
-		enableVideo: function() {
-			if (!this._videoAvailable || !this._webrtc) {
-				return false;
+				this.getUI('videoButton').attr('data-original-title', t('spreed', 'Enable video (v)'))
+					.addClass('local-video-disabled video-disabled icon-video-off')
+					.removeClass('icon-video');
+				this.getUI('audioButton').addClass('local-video-disabled');
+				this.getUI('screensharingButton').addClass('local-video-disabled');
 			}
 
-			this._webrtc.resumeVideo();
-
-			this.getUI('videoButton').attr('data-original-title', t('spreed', 'Disable video (v)'))
-				.removeClass('local-video-disabled video-disabled icon-video-off')
-				.addClass('icon-video');
-			this.getUI('audioButton').removeClass('local-video-disabled');
-			this.getUI('screensharingButton').removeClass('local-video-disabled');
-
-			this.videoEnabled = true;
+			this.videoEnabled = videoEnabled;
 
 			return true;
 		},