HTML builder improvement #320
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kvld
suggested changes
Jul 10, 2018
Stepic/CellWebViewHelper.swift
Outdated
| @@ -30,8 +30,7 @@ class CellWebViewHelper: NSObject { | |||
|
|
|||
| //Method sets text and returns the method which returns current cell height according to the webview content height | |||
| func setTextWithTeX(_ text: String, color: UIColor = UIColor.mainText) { | |||
| let scriptsString = "\(Scripts.localTexScript)\(Scripts.mathJaxFinishedScript)" | |||
| let html = HTMLBuilder.sharedBuilder.buildHTMLStringWith(head: scriptsString, body: text, textColor: color) | |||
| let html = HTMLProcessor.shared.process(htmlString: text, head: Scripts.mathJaxFinishedScript, textColor: color) | |||
There was a problem hiding this comment.
Мне кажется, что лучше было бы сделать процессор от обычной строки. А добавление скриптов в head/body и окрашивание в цвет (по сути тоже js скрипт) можно делать отдельно. В этом плане мне нравится Atributika. То есть, интерфейс примерно такой:
let processor = HTMLProcessor(html: text)
let processedHtml = processor
.inject(.maxJax, where: .head)
.inject(.textColor, where: .body)
.htmlThere was a problem hiding this comment.
Выглядит хорошо, да
kvld
suggested changes
Jul 10, 2018
Stepic/HTMLProcessor.swift
Outdated
| case .metaViewport: | ||
| return Scripts.metaViewport | ||
| case .localTex: | ||
| return Scripts.localTexScript |
There was a problem hiding this comment.
Scripts.localTexScript -> Scripts.localTex
и тд
kvld
suggested changes
Jul 10, 2018
Stepic/HTMLProcessor.swift
Outdated
| switch self { | ||
| case .audio: | ||
| return Scripts.audioTagWrapperInit | ||
| case .textColor(color: let color): |
There was a problem hiding this comment.
Можно просто писать case .textColor(let color) же 🤔
Stepic/HTMLProcessor.swift
Outdated
| var body = body | ||
| body = fixProtocolRelativeURLs(html: body) | ||
|
|
||
| var links = HTMLParsingUtil.getAllLinksWithText(body).map({return $0.link}) |
There was a problem hiding this comment.
var links = HTMLParsingUtil.getAllLinksWithText(body).map { $0.link }
Stepic/Scripts.swift
Outdated
| let script = loadScriptWithKey(textColorScriptKey) | ||
| return script.replacingOccurrences(of: "######", with: "#\(color.hexString)") | ||
| } | ||
|
|
||
| fileprivate static var mathJaxLocalPathScript: String { | ||
| // let path = NSBundle.mainBundle().pathForResource("MathJax", ofType: "js", inDirectory: "MathJax")! |
There was a problem hiding this comment.
Scripts может быть тоже почистить от всякого мусора?
kvld
approved these changes
Jul 10, 2018
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Задача: #APPS-1955
Описание:
Избавились от левых файлов с HTML парсингом. Запилили
HTMLProcessor, который подгружает все нужные скрипты и стили в нужные места, а также заменяет все, что не нужно в html-е на все, что нужно. Теперь для процессинга HTML не нужно знать ширину содержащей вьюшки, а стили не кривые и стыдные, а в css файлике.