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
Fix caret position after selected suggestion and media upload #7595
Merged
Gargron
merged 2 commits into
mastodon:master
from
ClearlyClaire:fixes/remove-leftover-from-attachment-url-insertion
May 23, 2018
Merged
Fix caret position after selected suggestion and media upload #7595
Gargron
merged 2 commits into
mastodon:master
from
ClearlyClaire:fixes/remove-leftover-from-attachment-url-insertion
May 23, 2018
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
ClearlyClaire
changed the title
Fix media upload reseting caret position to last inserted emoji
Fix caret position after selected suggestion and media upload
May 22, 2018
ykzts
requested changes
May 23, 2018
@@ -141,7 +141,6 @@ export default class ComposeForm extends ImmutablePureComponent { | |||
const emojiChar = data.native; |
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.
delete this line.
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.
Fixed
ClearlyClaire
force-pushed
the
fixes/remove-leftover-from-attachment-url-insertion
branch
from
May 23, 2018 08:23
ab9e4ed
to
2974391
Compare
ykzts
approved these changes
May 23, 2018
luckyyang
added a commit
to open-archive/moooon-network
that referenced
this pull request
May 24, 2018
* commit 'd8864b9e9d4fd56606a3b809bedeb1216b6620ae': (84 commits) Fix caret position after selected suggestion and media upload (mastodon#7595) Fix tests for invites controller (regression from 4d81809) (mastodon#7597) Yeah, it was supposed to be #create? Bump version to 2.4.0 Remove pointer to light theme until it is more polished (mastodon#7594) Remove unneeded code now that attachment URL isn't appended to toots (mastodon#7593) Do not encode HTML entities in initial Web Push payload body (mastodon#7592) [WIP] i18n: Update Simplified Chinese translations (mastodon#7576) Add tests for report notes controller (mastodon#7589) Enforce order on authorized applications page (mastodon#7587) Hide section headline for timelines in production (mastodon#7590) Change column params on pinned timeline (mastodon#7581) Remove outline (mastodon#7582) [RU] Added mastodon-light string (mastodon#7583) 🌍: 🇵🇱⬆️ (mastodon#7580) Save onlyMedia prop when pinning column (mastodon#7575) Display only domain of report account if remote under comment (mastodon#7574) Add exact attribute to WrappedRoute for community timeline (mastodon#7572) Bump version to 2.4.0rc5 Use real container width in MediaGallery srcSet (mastodon#7571) ... # Conflicts: # config/locales/en.yml # config/locales/simple_form.zh-CN.yml # config/locales/zh-CN.yml
abcang
pushed a commit
to pixiv/mastodon
that referenced
this pull request
Jun 4, 2018
…on#7595) * Fix media upload reseting caret position to last inserted emoji * Fix caret position after inserting suggestions (fixes mastodon#6089)
lawremipsum
pushed a commit
to lawremipsum/mspsocial-mastodon
that referenced
this pull request
Jul 7, 2018
…on#7595) * Fix media upload reseting caret position to last inserted emoji * Fix caret position after inserting suggestions (fixes mastodon#6089)
ClearlyClaire
deleted the
fixes/remove-leftover-from-attachment-url-insertion
branch
August 17, 2018 19:39
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.
This fixes caret position when selecting a suggestion (emoji or account) from the suggestion box.
Also, this fixes some overlooked cases in my previous PR.