Skip to content
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

Conversation

ClearlyClaire
Copy link
Contributor

@ClearlyClaire ClearlyClaire commented May 22, 2018

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.

@ClearlyClaire 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
@@ -141,7 +141,6 @@ export default class ComposeForm extends ImmutablePureComponent {
const emojiChar = data.native;
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@ClearlyClaire ClearlyClaire force-pushed the fixes/remove-leftover-from-attachment-url-insertion branch from ab9e4ed to 2974391 Compare May 23, 2018 08:23
@Gargron Gargron merged commit d8864b9 into mastodon:master 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 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants