Merge pull request #655 from marrus-sh/mastodon-frontend-character-count

Fixes #263; makes JavaScript's character counting the same as Ruby's
mastodon · Feb 27, 2017 · 5a7590d · 5a7590d
2 parents af5cb0f + 4d2af0d
commit 5a7590d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/assets/javascripts/components/features/compose/components/character_counter.jsx b/app/assets/javascripts/components/features/compose/components/character_counter.jsx
@@ -10,7 +10,7 @@ const CharacterCounter = React.createClass({
   mixins: [PureRenderMixin],
 
   render () {
-    const diff = this.props.max - this.props.text.length;
+    const diff = this.props.max - this.props.text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "_").length;
 
     return (
       <span style={{ fontSize: '16px', cursor: 'default' }}>