From e1c119469d3796b831137a9528800a0b89bfcbd6 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Sun, 26 Apr 2015 13:56:20 +0200
Subject: [PATCH] Correctly reset all styles by switching to invisible video
 layout renderer.

---
 static/js/directives/audiovideo.js |  9 ++++-
 static/js/services/videolayout.js  | 55 +++++++++++++++++-------------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/static/js/directives/audiovideo.js b/static/js/directives/audiovideo.js
index f982a250..147a1abb 100644
--- a/static/js/directives/audiovideo.js
+++ b/static/js/directives/audiovideo.js
@@ -401,7 +401,14 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
 						width: scope.layoutparent.width(),
 						height: scope.layoutparent.height()
 					}
-					var again = videoLayout.update(getRendererName(), size, scope, controller);
+					var name;
+					if (size.width < 1 || size.height < 1) {
+						// Use invisible renderer when no size available.
+						name = "invisible";
+					} else {
+						name = getRendererName();
+					}
+					var again = videoLayout.update(name, size, scope, controller);
 					if (again) {
 						// Layout needs a redraw.
 						needsRedraw = true;
diff --git a/static/js/services/videolayout.js b/static/js/services/videolayout.js
index 8253c9d1..a607900a 100644
--- a/static/js/services/videolayout.js
+++ b/static/js/services/videolayout.js
@@ -61,6 +61,13 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
 	// videoLayout
 	return ["$window", function($window) {
 
+		// Invisible layout (essentially shows nothing).
+		var Invisible = function(container, scope, controller) {};
+		Invisible.prototype.name = "invisible";
+		Invisible.prototype.render = function() {};
+		Invisible.prototype.close = function() {};
+
+
 		// Video layout with all videos rendered the same size.
 		var OnePeople = function(container, scope, controller) {};
 
@@ -326,28 +333,30 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
 		};
 
 		// Register renderers.
+		renderers[Invisible.prototype.name] = Invisible;
 		renderers[OnePeople.prototype.name] = OnePeople;
 		renderers[Smally.prototype.name] = Smally;
 		renderers[Democrazy.prototype.name] = Democrazy;
 		renderers[ConferenceKiosk.prototype.name] = ConferenceKiosk;
 		renderers[Auditorium.prototype.name] = Auditorium;
 
+		// Helper for class name generation.
+		var makeName = function(prefix, n, camel) {
+			var r = prefix;
+			if (camel) {
+				r = r + n.charAt(0).toUpperCase() + n.slice(1);
+			} else {
+				r = r + "-" + n;
+			}
+			return r;
+		};
+
 		// Public api.
 		var current = null;
 		var body = $("body");
 		return {
 			update: function(name, size, scope, controller) {
 
-				var makeName = function(prefix, n, camel) {
-					var r = prefix;
-					if (camel) {
-						r = r + n.charAt(0).toUpperCase() + n.slice(1);
-					} else {
-						r = r + "-" + n;
-					}
-					return r;
-				};
-
 				var videos = _.keys(controller.streams);
 				var streams = controller.streams;
 				var container = scope.container;
@@ -355,22 +364,20 @@ define(["jquery", "underscore", "modernizr", "injectCSS"], function($, _, Modern
 
 				if (!current) {
 					current = new renderers[name](container, scope, controller)
-					//console.log("Created new video layout renderer", name, current);
+					console.log("Created new video layout renderer", name, current);
+					$(layoutparent).addClass(makeName("renderer", name));
+					body.addClass(makeName("videolayout", name, true));
+					return true;
+				} else if (current && current.name !== name) {
+					current.close(container, scope, controller);
+					$(container).removeAttr("style");
+					$(layoutparent).removeClass(makeName("renderer", current.name));
+					body.removeClass(makeName("videolayout", current.name, true));
+					current = new renderers[name](container, scope, controller)
 					$(layoutparent).addClass(makeName("renderer", name));
-					$(body).addClass(makeName("videolayout", name, true));
+					body.addClass(makeName("videolayout", name, true));
+					console.log("Switched to new video layout renderer", name, current);
 					return true;
-				} else {
-					if (current.name !== name) {
-						current.close(container, scope, controller);
-						$(container).removeAttr("style");
-						$(layoutparent).removeClass(makeName("renderer", current.name));
-						$(body).removeClass(makeName("videolayout", current.name, true));
-						current = new renderers[name](container, scope, controller)
-						$(layoutparent).addClass(makeName("renderer", name));
-						$(body).addClass(makeName("videolayout", name, true));
-						//console.log("Switched to new video layout renderer", name, current);
-						return true;
-					}
 				}
 
 				return current.render(container, size, scope, videos, streams);