From 814e46743551f8edbf6ef2fd6806a0af32729161 Mon Sep 17 00:00:00 2001 From: it33 Date: Sun, 20 Sep 2015 21:24:27 -0700 Subject: Shorten description help text Currently it word wraps, this prevents word-wrapping --- web/react/components/new_channel_modal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components') diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx index fc7b8c183..fdc4a1273 100644 --- a/web/react/components/new_channel_modal.jsx +++ b/web/react/components/new_channel_modal.jsx @@ -150,7 +150,7 @@ export default class NewChannelModal extends React.Component { tabIndex='2' />

- {'This is the purpose of your channel and helps others decide whether to join.'} + {'Channel description helps others decide whether to join.'}

{serverError} -- cgit v1.2.3-1-g7c22 From 80488dec22a8b61302a2630946051c8d90ded833 Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 21 Sep 2015 15:26:44 -0700 Subject: Adjusting sentence --- web/react/components/new_channel_modal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components') diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx index fdc4a1273..a8d137bac 100644 --- a/web/react/components/new_channel_modal.jsx +++ b/web/react/components/new_channel_modal.jsx @@ -150,7 +150,7 @@ export default class NewChannelModal extends React.Component { tabIndex='2' />

- {'Channel description helps others decide whether to join.'} + {'Description helps others decide whether to join this channel.'}

{serverError} -- cgit v1.2.3-1-g7c22 From 251d33ad23bd737c5b6954b6e5db14ee0b2611eb Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 21 Sep 2015 17:30:29 -0400 Subject: Added parsing for named emojis to TextFormatting and removed dependency on emojify --- web/react/components/post_body.jsx | 1 - web/react/components/rhs_comment.jsx | 1 - web/react/components/rhs_root_post.jsx | 1 - 3 files changed, 3 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index e0682e997..dbbcdc409 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -35,7 +35,6 @@ export default class PostBody extends React.Component { parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); - global.window.emojify.run(React.findDOMNode(this.refs.message_span)); } componentDidMount() { diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx index fe31ac381..8cc2d309b 100644 --- a/web/react/components/rhs_comment.jsx +++ b/web/react/components/rhs_comment.jsx @@ -56,7 +56,6 @@ export default class RhsComment extends React.Component { } parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); - global.window.emojify.run(React.findDOMNode(this.refs.message_holder)); } componentDidMount() { this.parseEmojis(); diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 2ea697c5b..86620a499 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -20,7 +20,6 @@ export default class RhsRootPost extends React.Component { } parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); - global.window.emojify.run(React.findDOMNode(this.refs.message_holder)); } componentDidMount() { this.parseEmojis(); -- cgit v1.2.3-1-g7c22 From e7d408585af5df35c6aff1558de246c8398ef71c Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 22 Sep 2015 13:21:58 -0400 Subject: Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed emojify" --- web/react/components/post_body.jsx | 1 + web/react/components/rhs_comment.jsx | 1 + web/react/components/rhs_root_post.jsx | 1 + 3 files changed, 3 insertions(+) (limited to 'web/react/components') diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index dbbcdc409..e0682e997 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -35,6 +35,7 @@ export default class PostBody extends React.Component { parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); + global.window.emojify.run(React.findDOMNode(this.refs.message_span)); } componentDidMount() { diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx index 8cc2d309b..fe31ac381 100644 --- a/web/react/components/rhs_comment.jsx +++ b/web/react/components/rhs_comment.jsx @@ -56,6 +56,7 @@ export default class RhsComment extends React.Component { } parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); + global.window.emojify.run(React.findDOMNode(this.refs.message_holder)); } componentDidMount() { this.parseEmojis(); diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 86620a499..2ea697c5b 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -20,6 +20,7 @@ export default class RhsRootPost extends React.Component { } parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); + global.window.emojify.run(React.findDOMNode(this.refs.message_holder)); } componentDidMount() { this.parseEmojis(); -- cgit v1.2.3-1-g7c22