Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: devinross/tapkulibrary
base: 0b182a83b9
...
head fork: devinross/tapkulibrary
compare: a139bb34b3
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
View
2  src/TapkuLibrary/NSString+TKCategory.m
@@ -44,7 +44,7 @@ - (BOOL) isEmail{
@"z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5"
@"]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-"
@"9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21"
- @"-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";
+ @"-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";
NSPredicate *regExPredicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", emailRegEx];
return [regExPredicate evaluateWithObject:[self lowercaseString]];
View
4 src/TapkuLibrary/TKTextView.m
@@ -64,12 +64,10 @@ - (void) drawRect:(CGRect)rect{
if(self.placeHolderLabel.superview==nil){
[self addSubview:self.placeHolderLabel];
[self sendSubviewToBack:self.placeHolderLabel];
-
-
}
if([self respondsToSelector:@selector(textContainer)])
- self.placeHolderLabel.frame = CGRectMake(4, 8, self.bounds.size.width - 8, 0);
+ self.placeHolderLabel.frame = CGRectMake(4, self.textContainerInset.top, self.bounds.size.width - 8, 0);
else
self.placeHolderLabel.frame = CGRectMake(8,8,self.bounds.size.width - 16,0);

No commit comments for this range

Something went wrong with that request. Please try again.