Merge remote-tracking branch 'upstream/master'

Conflicts (resolved manually):
	css/main.css

conference.js

@@ -316,6 +316,19 @@ export default {
         this.roomName = options.roomName;
         JitsiMeetJS.setLogLevel(JitsiMeetJS.logLevels.TRACE);
 
+        // attaches global error handler, if there is already one, respect it
+        if(JitsiMeetJS.getGlobalOnErrorHandler){
+            var oldOnErrorHandler = window.onerror;
+            window.onerror = function (message, source, lineno, colno, error) {
+
+                JitsiMeetJS.getGlobalOnErrorHandler(
+                    message, source, lineno, colno, error);
+
+                if(oldOnErrorHandler)
+                    oldOnErrorHandler(message, source, lineno, colno, error);
+            };
+        }
+
         return JitsiMeetJS.init(config).then(() => {
             return Promise.all([
                 // try to retrieve audio and video

css/main.css

@@ -20,7 +20,7 @@ html, body{
     top: 0px;
     bottom: 0px;
     right: 0px;
-    width: 200px !important;
+    width: 0px;
     max-width: 200px;
     overflow-x: hidden;
     /* background-color:#dfebf1;*/

modules/UI/side_pannels/SidePanelToggler.js

@@ -38,13 +38,18 @@ function toggle (object, selector, onOpenComplete,
             queue: false,
             duration: 500
         });
+
         $(selector).hide("slide", {
             direction: "right",
             queue: false,
-            duration: 500
+            duration: 500,
+            // Set the size to 0 at the end of the animation to ensure that
+            // the is(":visible") function on this selector will return {false}
+            // when the element is hidden.
+            complete: function() {$(selector).css("width", "0");}
         });
 
-        resizeVideoArea(isSideBarVisible, onVideoResizeComplete);
+        resizeVideoArea(false, onVideoResizeComplete);
 
         if(typeof onClose === "function") {
             onClose();
@@ -52,7 +57,7 @@ function toggle (object, selector, onOpenComplete,
 
         currentlyOpen = null;
     } else {
-        resizeVideoArea(isSideBarVisible, onVideoResizeComplete);
+        resizeVideoArea(true, onVideoResizeComplete);
 
         // Undock the toolbar when the chat is shown and if we're in a
         // video mode.
@@ -76,6 +81,12 @@ function toggle (object, selector, onOpenComplete,
             queue: false,
             duration: 500
         });
+        // Set the size dynamically (not in the css), so that we're sure that
+        // when is(":visible") is called on this selector the result is {false}
+        // before it's actually visible.
+        // (Chrome seems to return {true} for an element which is in the DOM and
+        // has non-null size set).
+        $(selector).css("width", "20%");
         $(selector).show("slide", {
             direction: "right",
             queue: false,
@@ -91,9 +102,9 @@ function toggle (object, selector, onOpenComplete,
 }
 
 function resizeVideoArea(isSidePanelVisible, completeFunction) {
-    VideoLayout.resizeVideoArea(!isSidePanelVisible,
-        false,
-        false,
+    VideoLayout.resizeVideoArea(isSidePanelVisible,
+        false,//don't force thumbnail count update
+        true, //animate
         completeFunction);
 }