Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

indicate fbconnect and extern correctly

Summary:
Required for http://tools.intern.facebook.com/D111875

Test Plan:
Look at the other diff.

DiffCamp Revision: 111878
Reviewed By: brent
CC: platform-diffs@lists, lshepard, brent, mattwkelly, selekman
Revert Plan:
OK
  • Loading branch information...
commit 74fee83539265cbad2f4bb04b2d53086d87f5804 1 parent fb7919e
Naitik Shah daaku authored
Showing with 6 additions and 2 deletions.
  1. +3 −2 src/core/auth.js
  2. +3 −0  src/core/prelude.js
5 src/core/auth.js
View
@@ -422,7 +422,7 @@ FB.provide('UIServer.Methods', {
cancel_url : cancel,
channel_url : window.location.toString(),
next : next,
- fbconnect : 1,
+ fbconnect : FB._inCanvas ? 0 : 1,
req_perms : call.params.perms,
enable_profile_selector : call.params.enable_profile_selector,
profile_selector_ids : call.params.profile_selector_ids,
@@ -465,7 +465,8 @@ FB.provide('UIServer.Methods', {
no_session : xdHandler(cb, id, 'parent', false, 'notConnected'),
no_user : xdHandler(cb, id, 'parent', false, 'unknown'),
ok_session : xdHandler(cb, id, 'parent', false, 'connected'),
- session_version : 3
+ session_version : 3,
+ extern: FB._inCanvas ? 0 : 2
});
return call;
}
3  src/core/prelude.js
View
@@ -68,6 +68,9 @@ if (!window.FB) {
// logging is enabled by default. this is the logging shown to the
// developer and not at all noisy.
_logging: true,
+ _inCanvas: (
+ (window.location.search.indexOf('fb_sig_in_iframe=1') > -1) ||
+ (window.location.search.indexOf('session=') > -1)),
//
Please sign in to comment.
Something went wrong with that request. Please try again.