Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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: dwaite/GrowingTextView
base: 43a7f97cfa
...
head fork: dwaite/GrowingTextView
compare: 8a17a5514b
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Mar 25, 2012
@dkharrat dkharrat * change types of minHeight and maxHeight to CGFloat to maintain type
  compatibility with CGSize
* allow setting minHeight and maxHeight to custom values
* sizeToFit now readjusts frame height if necessary
* fixed issue where delegate method growingTextView:willChangeHeight:
* gets called on text change, even if height did not change.
c6e86c9
Commits on Jul 19, 2012
@timothyarmes timothyarmes Add placeholder string option 9321199
Commits on Aug 02, 2012
@mattrubin mattrubin Merge pull request #22 from timothyarmes/master eea1990
@mattrubin mattrubin Added animationDuration property 5a12daf
@mattrubin mattrubin Merge branch 'animation-duration' a5b0ca8
@mattrubin mattrubin Added animationDuration to the README fb5dbbe
Commits on Aug 03, 2012
@mattrubin mattrubin Merge branch 'animation-duration' ee4ac4d
@mattrubin mattrubin Don't draw the placeholder text until the view is done animating.
(When animating from a text view containing a single newline character to an empty text view, the placeholder text would appear stretched as the view animated from two lines to one)
cc0de7d
@mattrubin mattrubin Merge branch 'placeholder' 02a184c
Commits on Aug 11, 2012
@mattrubin mattrubin Added a dealloc method to release the internalTextView 1ef8e93
@mattrubin mattrubin Merge branch 'dealloc' 1c18b68
Commits on Aug 30, 2012
@darthtroll darthtroll Removed dealloc. 63cb8b9
@darthtroll darthtroll Merged dkharrat's modifications for re-sizing with minimum/maximum he…
…ights.
8979529
Commits on Sep 01, 2012
@darthtroll darthtroll Call resetSize in ViewController's willAnimateRotationToInterfaceOrie…
…ntation:duration method to have resizing work properly. This isn't the best solution…but better than nothing.
6483dc9
Commits on Sep 27, 2012
Ali Optimized minHeight and maxHeight calculation
Optimized initialization of default attributes
Vars that should be floats now float; vars that should be doubles now double.
01455d0
Ali Updated README.md 8b7653a
Ali Removed an old comment. 518514f
Commits on Oct 31, 2012
@egoldfarb egoldfarb Merge pull request #1 from HansPinckaers/master
Merge latest from head
e642a37
@egoldfarb egoldfarb Merge pull request #2 from gurd/master
Merge placeholder, animation duration, and optimized height calculation.
d35ca39
@egoldfarb egoldfarb Revert unwanted changes
This reverts commit c6e86c9.

Conflicts:
	class/HPGrowingTextView.h
	class/HPGrowingTextView.m
ff78365
Commits on Nov 01, 2012
@egoldfarb egoldfarb Merge branch 'master' of https://github.com/apiccion/GrowingTextView
…into apiccion-master

Conflicts:
	class/HPGrowingTextView.m
e3430a4
@egoldfarb egoldfarb Rotation now works on iOS6. Added actual placeholder to the example. fde60b2
Commits on Feb 02, 2013
@d-ross d-ross adding a new method that forces a resize of the textView's height (in…
… cases where you've changed max/min lines)
4523d94
Commits on Feb 06, 2013
@dwaite Move to modern style d4af6cd
@dwaite Move to modern style 9152a01
@dwaite Merge remote-tracking branch 'egoldfarb/master'
Conflicts:
	class/HPGrowingTextView.m
8a17a55
Something went wrong with that request. Please try again.