Compare commits
No commits in common. "38085eee379fc23a8c59ddfb81af79d775620ef9" and "fa358a3e97c3284dc7f0d90b26a6e5cf32b2a2f3" have entirely different histories.
38085eee37
...
fa358a3e97
|
@ -19,7 +19,6 @@ class ContentTextView: LinkTextView {
|
||||||
var navigationDelegate: TuskerNavigationDelegate?
|
var navigationDelegate: TuskerNavigationDelegate?
|
||||||
|
|
||||||
var defaultFont: UIFont = .systemFont(ofSize: 17)
|
var defaultFont: UIFont = .systemFont(ofSize: 17)
|
||||||
var defaultColor: UIColor = .label
|
|
||||||
|
|
||||||
override func awakeFromNib() {
|
override func awakeFromNib() {
|
||||||
super.awakeFromNib()
|
super.awakeFromNib()
|
||||||
|
@ -118,9 +117,9 @@ class ContentTextView: LinkTextView {
|
||||||
} else {
|
} else {
|
||||||
text = node.text()
|
text = node.text()
|
||||||
}
|
}
|
||||||
return NSAttributedString(string: text, attributes: [.font: defaultFont, .foregroundColor: defaultColor])
|
return NSAttributedString(string: text, attributes: [.font: defaultFont])
|
||||||
case let node as Element:
|
case let node as Element:
|
||||||
let attributed = NSMutableAttributedString(string: "", attributes: [.font: defaultFont, .foregroundColor: defaultColor])
|
let attributed = NSMutableAttributedString(string: "", attributes: [.font: defaultFont])
|
||||||
for child in node.getChildNodes() {
|
for child in node.getChildNodes() {
|
||||||
attributed.append(attributedTextForHTMLNode(child, usePreformattedText: usePreformattedText || node.tagName() == "pre"))
|
attributed.append(attributedTextForHTMLNode(child, usePreformattedText: usePreformattedText || node.tagName() == "pre"))
|
||||||
}
|
}
|
||||||
|
@ -181,7 +180,7 @@ class ContentTextView: LinkTextView {
|
||||||
// only accept touches that are over a link
|
// only accept touches that are over a link
|
||||||
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
|
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
|
||||||
if getLinkAtPoint(point) != nil || isSelectable {
|
if getLinkAtPoint(point) != nil || isSelectable {
|
||||||
return super.hitTest(point, with: event)
|
return self
|
||||||
} else {
|
} else {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue