diff --git a/build/titanium_version.py b/build/titanium_version.py index a50e7babf69..5e2763062b8 100755 --- a/build/titanium_version.py +++ b/build/titanium_version.py @@ -1 +1 @@ -version = '1.7.6' +version = '1.7.6-handprint' diff --git a/iphone/Classes/FBConnect/Facebook.m b/iphone/Classes/FBConnect/Facebook.m index 35ec8065aa4..b5286358d33 100644 --- a/iphone/Classes/FBConnect/Facebook.m +++ b/iphone/Classes/FBConnect/Facebook.m @@ -277,7 +277,7 @@ - (NSDictionary*)parseURLParams:(NSString *)query { - (void)authorize:(NSArray *)permissions { self.permissions = permissions; - [self authorizeWithFBAppAuth:YES safariAuth:YES]; + [self authorizeWithFBAppAuth:YES safariAuth:NO]; } /** @@ -323,7 +323,7 @@ - (BOOL)handleOpenURL:(NSURL *)url { // If the error response indicates that we should try again using Safari, open // the authorization dialog in Safari. if (errorReason && [errorReason isEqualToString:@"service_disabled_use_browser"]) { - [self authorizeWithFBAppAuth:NO safariAuth:YES]; + [self authorizeWithFBAppAuth:NO safariAuth:NO]; return YES; } diff --git a/iphone/Classes/TiBlob.m b/iphone/Classes/TiBlob.m index f2c593bf766..41a3f988d76 100644 --- a/iphone/Classes/TiBlob.m +++ b/iphone/Classes/TiBlob.m @@ -166,7 +166,7 @@ -(NSData*)data } case TiBlobTypeImage: { - return UIImageJPEGRepresentation(image,1.0); + return UIImageJPEGRepresentation(image,0.6); } } return data; diff --git a/iphone/Classes/TiMapView.m b/iphone/Classes/TiMapView.m index 03e118cebe7..8ae8f54cb35 100644 --- a/iphone/Classes/TiMapView.m +++ b/iphone/Classes/TiMapView.m @@ -387,7 +387,14 @@ -(void)setRegionFit_:(id)value -(void)setUserLocation_:(id)value { ENSURE_SINGLE_ARG(value,NSObject); - [self map].showsUserLocation = [TiUtils boolValue:value]; + BOOL boolValue = [TiUtils boolValue:value]; + [self map].showsUserLocation = boolValue; + if (boolValue) + { + MKUserLocation* userLocationAnnotation = [self map].userLocation; + userLocationAnnotation.title = nil; + userLocationAnnotation.subtitle = nil; + } } -(void)setLocation_:(id)location diff --git a/iphone/Classes/TiUITableViewRowProxy.m b/iphone/Classes/TiUITableViewRowProxy.m index afde4669c93..eec411fe50d 100644 --- a/iphone/Classes/TiUITableViewRowProxy.m +++ b/iphone/Classes/TiUITableViewRowProxy.m @@ -394,6 +394,14 @@ -(void)configureTitle:(UITableViewCell*)cell if (title!=nil) { [textLabel setText:title]; //UILabel already checks to see if it hasn't changed. + + id fontValue = [self valueForKey:@"font"]; + UIFont *font = nil; + if (fontValue!=nil) + { + font = [[TiUtils fontValue:[self valueForKey:@"font"]] font]; + textLabel.font = font; + } UIColor * textColor = [[TiUtils colorValue:[self valueForKey:@"color"]] _color]; [textLabel setTextColor:(textColor==nil)?[UIColor blackColor]:textColor];