Merge branch 'master' of github.com:soffes/SAMTextView

Author: Ivan Kovalisko

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Sam Soffes, http://soff.es
+Copyright (c) 2010-2014 Sam Soffes, http://soff.es
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

SAMTextView/SAMTextView.h

@@ -3,7 +3,7 @@
 //  SAMTextView
 //
 //  Created by Sam Soffes on 8/18/10.
-//  Copyright 2010-2013 Sam Soffes. All rights reserved.
+//  Copyright 2010-2014 Sam Soffes. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -23,7 +23,7 @@
 
 /**
  The attributed string that is displayed when there is no other text in the text view.
- 
+
  The default value is `nil`.
  */
 @property (nonatomic, strong) NSAttributedString *attributedPlaceholder;

SAMTextView/SAMTextView.m

@@ -3,7 +3,7 @@
 //  SAMTextView
 //
 //  Created by Sam Soffes on 8/18/10.
-//  Copyright 2010-2013 Sam Soffes. All rights reserved.
+//  Copyright 2010-2014 Sam Soffes. All rights reserved.
 //
 
 #import "SAMTextView.h"
@@ -36,21 +36,21 @@ - (void)setPlaceholder:(NSString *)string {
 	if ([string isEqualToString:self.attributedPlaceholder.string]) {
 		return;
 	}
-	
+
 	NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init];
-	if (self.typingAttributes) {
+	if ([self isFirstResponder] && self.typingAttributes) {
 		[attributes addEntriesFromDictionary:self.typingAttributes];
 	} else {
 		attributes[NSFontAttributeName] = self.font;
 		attributes[NSForegroundColorAttributeName] = [UIColor colorWithWhite:0.702f alpha:1.0f];
-		
+
 		if (self.textAlignment != NSTextAlignmentLeft) {
 			NSMutableParagraphStyle *paragraph = [[NSMutableParagraphStyle alloc] init];
 			paragraph.alignment = self.textAlignment;
 			attributes[NSParagraphStyleAttributeName] = paragraph;
 		}
 	}
-	
+
 	self.attributedPlaceholder = [[NSAttributedString alloc] initWithString:string attributes:attributes];
 }
 
@@ -64,9 +64,9 @@ - (void)setAttributedPlaceholder:(NSAttributedString *)attributedPlaceholder {
 	if ([_attributedPlaceholder isEqualToAttributedString:attributedPlaceholder]) {
 		return;
 	}
-	
+
 	_attributedPlaceholder = attributedPlaceholder;
-	
+
 	[self setNeedsDisplay];
 }
 
@@ -140,6 +140,11 @@ - (CGRect)placeholderRectForBounds:(CGRect)bounds {
 		CGFloat padding = self.textContainer.lineFragmentPadding;
 		rect.origin.x += padding;
 		rect.size.width -= padding * 2.0f;
+	} else {
+		if (self.contentInset.left == 0.0f) {
+			rect.origin.x += 8.0f;
+		}
+		rect.origin.y += 8.0f;
 	}
 
 	return rect;