Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Added user-settable numberOfLines for placeholderLabel #505

Merged
merged 2 commits into from
Aug 27, 2016
Merged

Added user-settable numberOfLines for placeholderLabel #505

merged 2 commits into from
Aug 27, 2016

Conversation

jedmund
Copy link
Contributor

@jedmund jedmund commented Aug 26, 2016

  • I've read and understood the Contributing guidelines and have done my best effort to follow them.
  • I've read and agree to the Code of Conduct.
  • I've been mindful about doing atomic commits, adding documentation to my changes, not refactoring too much.
  • I've a descriptive title and added any useful information for the reviewer. Where appropriate, I've attached a screenshot and/or screencast (gif preferrably).
  • I've read, agree to, and signed the Contributor License Agreement (CLA).

PR Summary

Added property to allow the user to set how many lines of text SLKTextView's placeholder should have.

Related Issues

This fixes issue #504.

@dzenbot
Copy link

dzenbot commented Aug 26, 2016

Thanks @jedmund.
Please complete the checklist and sign the CLA.

@jedmund
Copy link
Contributor Author

jedmund commented Aug 27, 2016

Done and done @dzenbot. Is the Travis CI build something I should worry about?

Thanks!

@@ -138,7 +138,6 @@ - (UILabel *)placeholderLabel
_placeholderLabel = [UILabel new];
_placeholderLabel.clipsToBounds = NO;
_placeholderLabel.autoresizesSubviews = NO;
_placeholderLabel.numberOfLines = 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jedmund Sup yo?, Sweet PR, you should keep this line though so that default number of lines is 1 as per the documentation you wrote.

@jedmund
Copy link
Contributor Author

jedmund commented Aug 27, 2016

Thanks @TosinAF! I knew something looked off. Added it back just now.

@dzenbot
Copy link

dzenbot commented Aug 27, 2016

Looks good!
Nice catch @TosinAF

@jedmund: The Travis CI is borken. I need to fix that thing (once more).

@dzenbot dzenbot merged commit 4c54bd0 into slackhq:master Aug 27, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants