From b92b7a32ddb56eb50d4eaa6932d7a305a13cb6d9 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Mon, 20 May 2013 22:39:42 -0500
Subject: [PATCH] Replace loadteams event with loadprefs init:loadprefs
 replaces init:loadteams and now fires when all preferences and teams are
 loaded.

---
 js/client-teambuilder.js | 2 +-
 js/client.js             | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 6c30afd13..5a84ae499 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -9,7 +9,7 @@
 
 			// left menu
 			this.$el.addClass('ps-room-light').addClass('scrollable');
-			app.on('init:loadteams', this.update, this);
+			app.on('init:loadprefs', this.update, this);
 			this.update();
 		},
 		focus: function() {
diff --git a/js/client.js b/js/client.js
index 8d00e53df..5ba08636f 100644
--- a/js/client.js
+++ b/js/client.js
@@ -289,8 +289,9 @@
 		 *   `init:unsupported`
 		 * 	   triggered if the user's browser is unsupported
 		 *
-		 *   `init:loadteams` (teams)
-		 *     triggered when loads are finished loading
+		 *   `init:loadprefs`
+		 *     triggered when preferences/teams are finished loading and are
+		 *     safe to read
 		 *
 		 *   `init:nothirdparty`
 		 *     triggered if the user has third-party cookies disabled and
@@ -373,7 +374,7 @@
 			// Simple connection: no cross-domain logic needed.
 			Config.server = Config.server || Config.defaultserver;
 			this.user.loadTeams();
-			this.trigger('init:loadteams');
+			this.trigger('init:loadprefs');
 			return this.connect();
 		},
 		/**
@@ -440,11 +441,11 @@
 						TeambuilderRoom.saveTeams = function() {
 							postCrossDomainMessage({teams: $.toJSON(app.user.teams)});
 						};
-						self.trigger('init:loadteams');
 						// prefs
 						if (data.prefs) {
 							Tools.prefs.data = $.parseJSON(data.prefs);
 						}
+						self.trigger('init:loadprefs');
 						Tools.prefs.save = function() {
 							postCrossDomainMessage({prefs: $.toJSON(this.data)});
 						};