"Merge branch 'master' of https://github.com/codecombat/codecombat

app/assets/index.html

@@ -74,6 +74,7 @@
   <script>
     // Additional JS functions here
     window.fbAsyncInit = function() {
+      Backbone.Mediator.publish('fbapi-loaded')
       FB.init({
         appId      : document.location.origin === 'http://localhost:3000' ? '607435142676437' : '148832601965463', // App ID
         channelUrl : document.location.origin +'/channel.html', // Channel File

app/views/play/ladder/ladder_tab.coffee

@@ -24,6 +24,8 @@ module.exports = class LadderTabView extends CocoView
     'click .connect-facebook': 'onConnectFacebook'
 
   subscriptions:
+    'fbapi-loaded': 'onFacebookAPILoaded'
+    'gapi-loaded': 'onGPlusAPILoaded'
     'facebook-logged-in': 'onConnectedWithFacebook'
 
   constructor: (options, @level, @sessions) ->
@@ -31,7 +33,6 @@ module.exports = class LadderTabView extends CocoView
     @teams = teamDataFromLevel @level
     @leaderboards = {}
     @refreshLadder()
-    @checkFriends()
 
   checkFriends: ->
     @loadingFacebookFriends = true
@@ -45,8 +46,14 @@ module.exports = class LadderTabView extends CocoView
     else
       @gplusSessionStateLoaded()
 
+  apiLoaded: ->
+    return unless @fbAPILoaded and @gplusAPILoaded
+    @checkFriends()
   # FACEBOOK
 
+  onFacebookAPILoaded: ->
+    @fbAPILoaded = true
+    @apiLoaded()
   # Connect button pressed
 
   onConnectFacebook: ->
@@ -80,6 +87,10 @@ module.exports = class LadderTabView extends CocoView
 
   # GOOGLE PLUS
 
+  onGPlusAPILoaded: ->
+    @gplusAPILoaded = true
+    @apiLoaded()
+
   gplusSessionStateLoaded: ->
     if application.gplusHandler.loggedIn
       @loadingGPlusFriends = true
@@ -141,16 +152,13 @@ class LeaderboardData
     @topPlayers = new LeaderboardCollection(@level, {order:-1, scoreOffset: HIGHEST_SCORE, team: @team, limit: 20})
     promises = []
     promises.push @topPlayers.fetch()
-    @topPlayers.once 'sync', @onceLeaderboardPartLoaded, @
 
     if @session
       score = @session.get('totalScore') or 10
       @playersAbove = new LeaderboardCollection(@level, {order:1, scoreOffset: score, limit: 4, team: @team})
       promises.push @playersAbove.fetch()
-      @playersAbove.once 'sync', @onceLeaderboardPartLoaded, @
       @playersBelow = new LeaderboardCollection(@level, {order:-1, scoreOffset: score, limit: 4, team: @team})
       promises.push @playersBelow.fetch()
-      @playersBelow.once 'sync', @onceLeaderboardPartLoaded, @
       level = "#{level.get('original')}.#{level.get('version').major}"
       success = (@myRank) =>
       promises.push $.ajax "/db/level/#{level}/leaderboard_rank?scoreOffset=#{@session.get('totalScore')}&team=#{@team}", {success}