Merge pull request #1308 from jitsi/ss_resize_remote

Fix for the size of remote desktop sharing videos

modules/UI/videolayout/LargeVideoManager.js

@@ -23,6 +23,8 @@ export default class LargeVideoManager {
         this.eventEmitter = emitter;
 
         this.state = VIDEO_CONTAINER_TYPE;
+        // FIXME: We are passing resizeContainer as parameter which is calling
+        // Container.resize. Probably there's better way to implement this.
         this.videoContainer = new VideoContainer(
             () => this.resizeContainer(VIDEO_CONTAINER_TYPE), emitter);
         this.addContainer(VIDEO_CONTAINER_TYPE, this.videoContainer);

modules/UI/videolayout/VideoContainer.js

@@ -164,12 +164,20 @@ export class VideoContainer extends LargeContainer {
         return getStreamOwnerId(this.stream);
     }
 
-    constructor (onPlay, emitter) {
+    /**
+     * Creates new VideoContainer instance.
+     * @param resizeContainer {Function} function that takes care of the size
+     * of the video container.
+     * @param emitter {EventEmitter} the event emitter that will be used by
+     * this instance.
+     */
+    constructor (resizeContainer, emitter) {
         super();
         this.stream = null;
         this.videoType = null;
         this.localFlipX = true;
         this.emitter = emitter;
+        this.resizeContainer = resizeContainer;
 
         this.isVisible = false;
 
@@ -199,8 +207,8 @@ export class VideoContainer extends LargeContainer {
         this.avatarHeight = $("#dominantSpeakerAvatar").height();
 
         var onPlayCallback = function (event) {
-            if (typeof onPlay === 'function') {
-                onPlay(event);
+            if (typeof resizeContainer === 'function') {
+                resizeContainer(event);
             }
             this.wasVideoRendered = true;
         }.bind(this);
@@ -336,8 +344,14 @@ export class VideoContainer extends LargeContainer {
      * @param {string} videoType video type
      */
     setStream (stream, videoType) {
-
         if (this.stream === stream) {
+            // Handles the use case for the remote participants when the
+            // videoType is received with delay after turning on/off the
+            // desktop sharing.
+            if(this.videoType !== videoType) {
+                this.videoType = videoType;
+                this.resizeContainer();
+            }
             return;
         } else {
             // The stream has changed, so the image will be lost on detach

prosody-plugins/mod_muc_allowners.lua

@@ -0,0 +1,13 @@
+-- Copyright (c) 2015 &yet <https://andyet.com>
+-- https://github.com/otalk/mod_muc_allowners/blob/9a86266a25ed32ade150742cc79f5a1669765a8f/mod_muc_allowners.lua
+--
+-- Used under the terms of the MIT License
+-- https://github.com/otalk/mod_muc_allowners/blob/9a86266a25ed32ade150742cc79f5a1669765a8f/LICENSE
+
+local muc_service = module:depends("muc");
+local room_mt = muc_service.room_mt;
+
+
+room_mt.get_affiliation = function (room, jid)
+    return "owner";
+end

prosody-plugins/muc_owner_allow_kick.patch

@@ -0,0 +1,21 @@
+--- muc.lib.lua	2016-10-26 18:26:53.432377291 +0000
++++ muc.lib.lua	2016-10-26 18:41:40.754426072 +0000
+@@ -1256,15 +1256,16 @@
+ 	if actor == true then
+ 		actor = nil -- So we can pass it safely to 'publicise_occupant_status' below
+ 	else
++		local actor_affiliation = self:get_affiliation(actor);
++
+ 		-- Can't do anything to other owners or admins
+ 		local occupant_affiliation = self:get_affiliation(occupant.bare_jid);
+-		if occupant_affiliation == "owner" or occupant_affiliation == "admin" then
++		if (occupant_affiliation == "owner" and actor_affiliation ~= "owner") or (occupant_affiliation == "admin" and actor_affiliation ~= "admin" and actor_affiliation ~= "owner") then
+ 			return nil, "cancel", "not-allowed";
+ 		end
+ 
+ 		-- If you are trying to give or take moderator role you need to be an owner or admin
+ 		if occupant.role == "moderator" or role == "moderator" then
+-			local actor_affiliation = self:get_affiliation(actor);
+ 			if actor_affiliation ~= "owner" and actor_affiliation ~= "admin" then
+ 				return nil, "cancel", "not-allowed";
+ 			end

react/features/unsupported-browser/components/UnsupportedMobileBrowser.js

@@ -74,7 +74,7 @@ class UnsupportedMobileBrowser extends Component {
                 <div className = { `${ns}__body` }>
                     <img
                         className = { `${ns}__logo` }
-                        src = '/images/logo-blue.svg' />
+                        src = 'images/logo-blue.svg' />
                     <p className = { `${ns}__text` }>
                         You need <strong>Jitsi Meet</strong> to join a
                         conversation on your mobile
@@ -97,9 +97,40 @@ class UnsupportedMobileBrowser extends Component {
                         </button>
                     </a>
                 </div>
+
+                {
+                    this._renderStyle()
+                }
             </div>
         );
     }
+
+    /**
+     * Renders an HTML style element with CSS specific to
+     * this UnsupportedMobileBrowser.
+     *
+     * @private
+     * @returns {ReactElement}
+     */
+    _renderStyle() {
+        // Temasys provide lib-jitsi-meet/modules/RTC/adapter.screenshare.js
+        // which detects whether the browser supports WebRTC. If the browser
+        // does not support WebRTC, it displays an alert in the form of a yellow
+        // bar at the top of the page. The alert notifies the user that the
+        // browser does not support WebRTC and, if Temasys provide a plugin for
+        // the browser, the alert contains a button to initiate installing the
+        // browser. When Temasys do not provide a plugin for the browser, we do
+        // not want the alert on the unsupported-browser page because the
+        // notification about the lack of WebRTC support is the whole point of
+        // the unsupported-browser page.
+        return (
+            <style type = 'text/css'>
+                {
+                    'iframe[name="adapterjs-alert"] { display: none; }'
+                }
+            </style>
+        );
+    }
 }
 
 /**

webpack.config.js

@@ -33,6 +33,23 @@ if (minimize) {
             NODE_ENV: JSON.stringify('production')
         }
     }));
+
+    // While webpack will automatically insert UglifyJsPlugin when minimize is
+    // true, the defaults of UglifyJsPlugin in webpack 1 and webpack 2 are
+    // different. Explicitly state what we want even if we want defaults in
+    // order to prepare for webpack 2.
+    plugins.push(new webpack.optimize.UglifyJsPlugin({
+        compress: {
+            // It is nice to see warnings from UglifyJsPlugin that something is
+            // unused and, consequently, is removed. The default is false in
+            // webpack 2.
+            warnings: true
+        },
+
+        // Use the source map to map error message locations to modules. The
+        // default is false in webpack 2.
+        sourceMap: true
+    }));
 }
 
 // The base Webpack configuration to bundle the JavaScript artifacts of
@@ -56,7 +73,7 @@ var config = {
             // as well.
 
             exclude: node_modules,
-            loader: 'babel',
+            loader: 'babel-loader',
             query: {
                 // XXX The require.resolve bellow solves failures to locate the
                 // presets when lib-jitsi-meet, for example, is npm linked in
@@ -74,20 +91,20 @@ var config = {
             // to be available in such a form by multiple jitsi-meet
             // dependencies including AUI, lib-jitsi-meet.
 
-            loader: 'expose?$!expose?jQuery',
+            loader: 'expose-loader?$!expose-loader?jQuery',
             test: /\/node_modules\/jquery\/.*\.js$/
         }, {
             // Disable AMD for the Strophe.js library or its imports will fail
             // at runtime.
 
-            loader: 'imports?define=>false&this=>window',
+            loader: 'imports-loader?define=>false&this=>window',
             test: strophe
         }, {
             // Allow CSS to be imported into JavaScript.
 
             loaders: [
-                'style',
-                'css'
+                'style-loader',
+                'css-loader'
             ],
             test: /\.css$/
         }, {
@@ -95,7 +112,7 @@ var config = {
             // by CSS into the output path.
 
             include: aui_css,
-            loader: 'file',
+            loader: 'file-loader',
             query: {
                 context: aui_css,
                 name: '[path][name].[ext]'
@@ -104,7 +121,7 @@ var config = {
         }, {
             // Enable the import of JSON files.
 
-            loader: 'json',
+            loader: 'json-loader',
             exclude: node_modules,
             test: /\.json$/
         } ],