summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-06-29 22:36:55 +0800
committerHarrison Healey <harrisonmhealey@gmail.com>2017-06-29 10:36:55 -0400
commit94e734c1bdc2f7e377a469c57add45cf9261fba7 (patch)
tree09a810dc08d847194ae314c405201a7c36b941c4 /webapp
parentfcc9a8e6ae006b3609a0d6e013ad0060bc2f1c2a (diff)
downloadchat-94e734c1bdc2f7e377a469c57add45cf9261fba7.tar.gz
chat-94e734c1bdc2f7e377a469c57add45cf9261fba7.tar.bz2
chat-94e734c1bdc2f7e377a469c57add45cf9261fba7.zip
[PLT-6655] Remove 1024 character limit with text settings at system console, except sitename of custom branding (#6597)
* remove 1024 character limit with text settings at system console, except sitename of custom branding * add ability to set textarea of TextSetting
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/text_setting.jsx5
-rw-r--r--webapp/utils/constants.jsx1
2 files changed, 2 insertions, 4 deletions
diff --git a/webapp/components/admin_console/text_setting.jsx b/webapp/components/admin_console/text_setting.jsx
index 879e352a4..5830828d2 100644
--- a/webapp/components/admin_console/text_setting.jsx
+++ b/webapp/components/admin_console/text_setting.jsx
@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
import React from 'react';
import Setting from './setting.jsx';
-import Constants from 'utils/constants.jsx';
export default class TextSetting extends React.Component {
static get propTypes() {
@@ -32,7 +31,7 @@ export default class TextSetting extends React.Component {
static get defaultProps() {
return {
type: 'input',
- maxLength: Constants.MAX_TEXTSETTING_LENGTH
+ maxLength: null
};
}
@@ -67,9 +66,9 @@ export default class TextSetting extends React.Component {
id={this.props.id}
className='form-control'
rows='5'
- maxLength='1024'
placeholder={this.props.placeholder}
value={this.props.value}
+ maxLength={this.props.maxLength}
onChange={this.handleChange}
disabled={this.props.disabled}
/>
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index 477495423..46cb009fd 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -931,7 +931,6 @@ export const Constants = {
MAX_POSITION_LENGTH: 35,
MIN_TRIGGER_LENGTH: 1,
MAX_TRIGGER_LENGTH: 128,
- MAX_TEXTSETTING_LENGTH: 1024,
MAX_SITENAME_LENGTH: 30,
TIME_SINCE_UPDATE_INTERVAL: 30000,
MIN_HASHTAG_LINK_LENGTH: 3,