mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-28 01:55:38 -05:00
Handled conflicts, throwing out changes to ladder_tab.coffee.
This commit is contained in:
commit
4e284d81b7
1 changed files with 8 additions and 8 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue