forked from AttorneyOnline/AO2-Client
-
Notifications
You must be signed in to change notification settings - Fork 2
Remove html filter #19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
EstatoDeviato
wants to merge
8
commits into
Crystalwarrior:master
Choose a base branch
from
EstatoDeviato:remove-html-filter
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
0571ac6
Update ms maximum
EstatoDeviato d083e64
Update courtroom.h
EstatoDeviato 4a62d7b
remove html filter
EstatoDeviato 2c89170
add close tags function
EstatoDeviato 8330e02
add close tags function
EstatoDeviato ce33572
from std::string to QString
EstatoDeviato 9609f2f
from std::string to QString
EstatoDeviato 35e69d6
Update aotextarea.cpp
EstatoDeviato File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,9 +32,8 @@ void AOTextArea::append_chatmessage(QString p_name, QString p_message, | |
| p_message += " "; | ||
| } | ||
|
|
||
| QString result = p_message.toHtmlEscaped() | ||
| .replace("\n", "<br>") | ||
| .replace(url_parser_regex, "<a href='\\1'>\\1</a>"); | ||
| QString result = this->closetags(p_message); | ||
| result = result.replace("\n", "<br>").replace(url_parser_regex, "<a href='\\1'>\\1</a>"); | ||
|
|
||
| if (!p_color.isEmpty()) { | ||
| result = "<font color=" + p_color + ">" + result + "</font>"; | ||
|
|
@@ -81,3 +80,33 @@ void AOTextArea::auto_scroll(QTextCursor old_cursor, int old_scrollbar_value, | |
| this->verticalScrollBar()->setValue(this->verticalScrollBar()->maximum()); | ||
| } | ||
| } | ||
|
|
||
| QString AOTextArea::closetags(QString html) | ||
| { | ||
| QRegExp opened_regex("(<([a-z]+)(?: .*)?(?<![/|/ ])>)"); | ||
| QRegExp closed_regex("(</([a-z]+)>)"); | ||
|
|
||
| opened_regex.indexIn(html); | ||
| closed_regex.indexIn(html); | ||
| QStringList opentags = opened_regex.capturedTexts(); | ||
| QStringList closetags = closed_regex.capturedTexts(); | ||
|
|
||
| int size_opentags = opentags.count(); | ||
| for (int i = 1; i <= size_opentags; i++) { | ||
| if (i <= closetags.count()) { | ||
| QString expected_opentag = closetags.at(i - 1); | ||
| expected_opentag = expected_opentag.replace("</", "<").replace(">", ""); | ||
| if (!opentags.at(size_opentags - i).startsWith(expected_opentag)) { | ||
| QString expected_closetag = opentags.at(size_opentags - i); | ||
| expected_closetag = expected_closetag.replace("<", "</"); | ||
| html = html + expected_closetag; | ||
| } | ||
| } | ||
| else { | ||
| QString expected_closetag = opentags.at(size_opentags - i); | ||
| expected_closetag = expected_closetag.replace("<", "</"); | ||
| html = html + expected_closetag; | ||
| } | ||
| } | ||
| return html; | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| } | ||
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.


There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For url parse regex we'll need to not do that if it's already handled via html