From 3b52d4e407eb2b0883a975e3ce4f576582f460f1 Mon Sep 17 00:00:00 2001 From: vdemay Date: Wed, 1 Aug 2012 11:32:07 +0200 Subject: [PATCH] prepare for FB/TW login --- ScoopItFramework/Classes/.DS_Store | Bin 6148 -> 6148 bytes ScoopItFramework/Classes/UI/SIDialog.m | 4 ++-- ScoopItFramework/SIScoopIt.h | 2 +- ScoopItFramework/SIScoopIt.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ScoopItFramework/Classes/.DS_Store b/ScoopItFramework/Classes/.DS_Store index dacb947d3d5e1e3ba16fd140cbd42cc2862837de..a99c502ce9f6b6cf1c919527008d8172cea86b8b 100644 GIT binary patch delta 32 ocmZoMXffDe#WGokHJ!=GeDV?&rO7kdG&a9uk!0S?#_^9I0H{j}GXMYp delta 46 zcmZoMXffDe#lpB@G9Ozqn`Cvhp{42M#Vks!wRQCkjg#lH$ul-@e#IigyqTTjFFycT Crw<7L diff --git a/ScoopItFramework/Classes/UI/SIDialog.m b/ScoopItFramework/Classes/UI/SIDialog.m index be86fbc..9e3a5f8 100755 --- a/ScoopItFramework/Classes/UI/SIDialog.m +++ b/ScoopItFramework/Classes/UI/SIDialog.m @@ -369,7 +369,7 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *) if ([[url absoluteString] hasPrefix:@"http://si.ok"]) { [self dialogDidSucceed:url]; return NO; - } else if (navigationType == UIWebViewNavigationTypeLinkClicked) { + } /*else if (navigationType == UIWebViewNavigationTypeLinkClicked) { if ([_delegate respondsToSelector:@selector(dialog:shouldOpenURLInExternalBrowser:)]) { if (![_delegate dialog:self shouldOpenURLInExternalBrowser:url]) { return NO; @@ -378,7 +378,7 @@ - (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *) [[UIApplication sharedApplication] openURL:request.URL]; return NO; - } + }*/ return YES; } diff --git a/ScoopItFramework/SIScoopIt.h b/ScoopItFramework/SIScoopIt.h index d935aed..8ce14be 100644 --- a/ScoopItFramework/SIScoopIt.h +++ b/ScoopItFramework/SIScoopIt.h @@ -26,7 +26,7 @@ #define BASE_URL @"http://www.scoop.it/" -//#define BASE_URL @"http://10.0.0.144:8888/" +//#define BASE_URL @"http://10.0.0.138:8888/" typedef enum SIRequestType { diff --git a/ScoopItFramework/SIScoopIt.m b/ScoopItFramework/SIScoopIt.m index 4867bd4..c5d7b2a 100644 --- a/ScoopItFramework/SIScoopIt.m +++ b/ScoopItFramework/SIScoopIt.m @@ -196,7 +196,7 @@ - (void)dialog:(SIDialog*)dialog didFailWithError:(NSError*)error { } - (BOOL)dialog:(SIDialog*)dialog shouldOpenURLInExternalBrowser:(NSURL*)url { - return YES; + return NO; }