Handled conflicts, throwing out changes to ladder_tab.coffee.

This commit is contained in:
Scott Erickson 2014-07-04 17:36:10 -07:00
commit 4e284d81b7

View file

@ -1,7 +1,6 @@
module.exports = initializeFacebook = ->
# Additional JS functions here
window.fbAsyncInit = ->
Backbone.Mediator.publish "fbapi-loaded"
FB.init
appId: (if document.location.origin is "http://localhost:3000" then "607435142676437" else "148832601965463") # App ID
channelUrl: document.location.origin + "/channel.html" # Channel File
@ -9,6 +8,7 @@ module.exports = initializeFacebook = ->
cookie: true # enable cookies to allow the server to access the session
xfbml: true # parse XFBML
Backbone.Mediator.publish "fbapi-loaded"
# This is fired for any auth related change, such as login, logout or session refresh.
FB.Event.subscribe "auth.authResponseChange", (response) ->
@ -36,7 +36,7 @@ module.exports = initializeFacebook = ->
js.async = true
js.src = "//connect.facebook.net/en_US/all.js"
#js.src = "//connect.facebook.net/en_US/all/debug.js";
#js.src = "//connect.facebook.net/en_US/all/debug.js"
ref.parentNode.insertBefore js, ref
return
) document