Skip to content

Commit 6f7d6ad

Browse files
authored
Merge pull request #33 from philippeauriach/swift3
converted to latest swift 3
2 parents 8a0d262 + 4a64ccb commit 6f7d6ad

File tree

7 files changed

+147
-122
lines changed

7 files changed

+147
-122
lines changed

Example/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 32 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/NextGrowingTextView.xcscheme

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/NextGrowingTextView/Info.plist

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Pods-NextGrowingTextView_Example/Info.plist

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/Pods-NextGrowingTextView_Tests/Info.plist

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pod/Classes/NextGrowingInternalTextView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal class NextGrowingInternalTextView: UITextView {
4949
}
5050
}
5151

52-
var placeholderAttributedText: AttributedString? {
52+
var placeholderAttributedText: NSAttributedString? {
5353
didSet {
5454
self.setNeedsDisplay()
5555
}
@@ -82,20 +82,20 @@ internal class NextGrowingInternalTextView: UITextView {
8282

8383
// MARK: Private
8484

85-
private var displayPlaceholder: Bool = true {
85+
fileprivate var displayPlaceholder: Bool = true {
8686
didSet {
8787
if oldValue != self.displayPlaceholder {
8888
self.setNeedsDisplay()
8989
}
9090
}
9191
}
9292

93-
private dynamic func textDidChangeNotification(_ notification: Notification) {
93+
fileprivate dynamic func textDidChangeNotification(_ notification: Notification) {
9494

9595
self.updatePlaceholder()
9696
}
9797

98-
private func updatePlaceholder() {
98+
fileprivate func updatePlaceholder() {
9999
self.displayPlaceholder = self.text.characters.count == 0
100100
}
101101
}

0 commit comments

Comments
 (0)