Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ matrix:
language: node_js
node_js: "8"
jdk: oraclejdk8
before_script: pod repo update
script: cd src && npm run build.iosOnly && cd ../demo && npm i && tns build ios --env.uglify && cd ../demo-angular && npm i && tns build ios --env.uglify --env.aot
- language: android
os: linux
Expand Down Expand Up @@ -52,6 +53,7 @@ matrix:
language: node_js
node_js: "8"
jdk: oraclejdk8
before_script: pod repo update
script:
- cd demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build
- cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE demo.app
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pod 'FBSDKCoreKit', '~> 4.7'
pod 'FBSDKLoginKit', '~> 4.7'
pod 'FBSDKShareKit', '~> 4.7'
pod 'FBSDKShareKit', '~> 4.39.1'
22 changes: 11 additions & 11 deletions src/platforms/ios/typings/objc!FBSDKShareKit.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@ declare class FBSDKAppInviteDialog extends NSObject {

static showWithContentDelegate(content: FBSDKAppInviteContent, delegate: FBSDKAppInviteDialogDelegate): FBSDKAppInviteDialog;

readonly canShow: boolean;

content: FBSDKAppInviteContent;

delegate: FBSDKAppInviteDialogDelegate;

fromViewController: UIViewController;

canShow(): boolean;

show(): boolean;

validateWithError(): boolean;
Expand Down Expand Up @@ -455,14 +455,14 @@ declare class FBSDKGameRequestDialog extends NSObject {

static showWithContentDelegate(content: FBSDKGameRequestContent, delegate: FBSDKGameRequestDialogDelegate): FBSDKGameRequestDialog;

readonly canShow: boolean;

content: FBSDKGameRequestContent;

delegate: FBSDKGameRequestDialogDelegate;

frictionlessRequestsEnabled: boolean;

canShow(): boolean;

show(): boolean;

validateWithError(): boolean;
Expand Down Expand Up @@ -734,6 +734,8 @@ declare class FBSDKMessageDialog extends NSObject implements FBSDKSharingDialog

static showWithContentDelegate(content: FBSDKSharingContent, delegate: FBSDKSharingDelegate): FBSDKMessageDialog;

readonly canShow: boolean; // inherited from FBSDKSharingDialog

readonly debugDescription: string; // inherited from NSObjectProtocol

delegate: FBSDKSharingDelegate; // inherited from FBSDKSharing
Expand All @@ -752,8 +754,6 @@ declare class FBSDKMessageDialog extends NSObject implements FBSDKSharingDialog

readonly // inherited from NSObjectProtocol

canShow(): boolean;

class(): typeof NSObject;

conformsToProtocol(aProtocol: any /* Protocol */): boolean;
Expand Down Expand Up @@ -848,6 +848,8 @@ declare class FBSDKShareAPI extends NSObject implements FBSDKSharing {

accessToken: FBSDKAccessToken;

readonly canShare: boolean;

graphNode: string;

message: string;
Expand All @@ -870,8 +872,6 @@ declare class FBSDKShareAPI extends NSObject implements FBSDKSharing {

readonly // inherited from NSObjectProtocol

canShare(): boolean;

class(): typeof NSObject;

conformsToProtocol(aProtocol: any /* Protocol */): boolean;
Expand Down Expand Up @@ -1068,6 +1068,8 @@ declare class FBSDKShareDialog extends NSObject implements FBSDKSharingDialog {

mode: FBSDKShareDialogMode;

readonly canShow: boolean; // inherited from FBSDKSharingDialog

readonly debugDescription: string; // inherited from NSObjectProtocol

delegate: FBSDKSharingDelegate; // inherited from FBSDKSharing
Expand All @@ -1086,8 +1088,6 @@ declare class FBSDKShareDialog extends NSObject implements FBSDKSharingDialog {

readonly // inherited from NSObjectProtocol

canShow(): boolean;

class(): typeof NSObject;

conformsToProtocol(aProtocol: any /* Protocol */): boolean;
Expand Down Expand Up @@ -2422,7 +2422,7 @@ declare var FBSDKSharingDelegate: {

interface FBSDKSharingDialog extends FBSDKSharing {

canShow(): boolean;
canShow: boolean;

show(): boolean;
}
Expand Down
4 changes: 2 additions & 2 deletions src/share-manager.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export function canShareDialogShow(content: any): boolean {
if (content) {
const dialog = getShareDialog();
getShareDialog().shareContent = content;
return dialog.canShow();
return dialog.canShow;
}
return false;
}
Expand All @@ -169,7 +169,7 @@ export function canMessageDialogShow(content: any): boolean {
if (content) {
const dialog = getMessageDialog();
getMessageDialog().shareContent = content;
return dialog.canShow();
return dialog.canShow;
}
return false;
}