diff options
14 files changed, 31 insertions, 31 deletions
diff --git a/app/javascript/flavours/glitch/components/account.js b/app/javascript/flavours/glitch/components/account.js index 265ee94f6..df17f1897 100644 --- a/app/javascript/flavours/glitch/components/account.js +++ b/app/javascript/flavours/glitch/components/account.js @@ -132,7 +132,7 @@ export default class Account extends ImmutablePureComponent { <div className='account__relationship'> {buttons} </div> - : null} + : null} </div> </div> ); diff --git a/app/javascript/flavours/glitch/components/attachment_list.js b/app/javascript/flavours/glitch/components/attachment_list.js index b3d00b335..3a28c70f3 100644 --- a/app/javascript/flavours/glitch/components/attachment_list.js +++ b/app/javascript/flavours/glitch/components/attachment_list.js @@ -21,9 +21,9 @@ export default class AttachmentList extends ImmutablePureComponent { <ul className='attachment-list__list'> {media.map(attachment => - <li key={attachment.get('id')}> + (<li key={attachment.get('id')}> <a href={attachment.get('remote_url')} target='_blank' rel='noopener'>{filename(attachment.get('remote_url'))}</a> - </li> + </li>) )} </ul> </div> diff --git a/app/javascript/flavours/glitch/components/collapsable.js b/app/javascript/flavours/glitch/components/collapsable.js index fe125a729..0e8b04033 100644 --- a/app/javascript/flavours/glitch/components/collapsable.js +++ b/app/javascript/flavours/glitch/components/collapsable.js @@ -6,9 +6,9 @@ import PropTypes from 'prop-types'; const Collapsable = ({ fullHeight, isVisible, children }) => ( <Motion defaultStyle={{ opacity: !isVisible ? 0 : 100, height: isVisible ? fullHeight : 0 }} style={{ opacity: spring(!isVisible ? 0 : 100), height: spring(!isVisible ? 0 : fullHeight) }}> {({ opacity, height }) => - <div style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100, display: Math.floor(opacity) === 0 ? 'none' : 'block' }}> + (<div style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100, display: Math.floor(opacity) === 0 ? 'none' : 'block' }}> {children} - </div> + </div>) } </Motion> ); diff --git a/app/javascript/flavours/glitch/components/icon_button.js b/app/javascript/flavours/glitch/components/icon_button.js index 13b91e8a1..dfbe75110 100644 --- a/app/javascript/flavours/glitch/components/icon_button.js +++ b/app/javascript/flavours/glitch/components/icon_button.js @@ -116,7 +116,7 @@ export default class IconButton extends React.PureComponent { return ( <Motion defaultStyle={motionDefaultStyle} style={motionStyle}> {({ rotate }) => - <button + (<button aria-label={title} aria-pressed={pressed} aria-expanded={expanded} @@ -128,7 +128,7 @@ export default class IconButton extends React.PureComponent { > <i style={{ transform: `rotate(${rotate}deg)` }} className={`fa fa-fw fa-${icon}`} aria-hidden='true' /> {this.props.label} - </button> + </button>) } </Motion> ); diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index 4feb9180b..feffc2d59 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -318,14 +318,14 @@ export default class Status extends ImmutablePureComponent { media = ( <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} > - {Component => <Component + {Component => (<Component preview={video.get('preview_url')} src={video.get('url')} sensitive={status.get('sensitive')} letterbox={settings.getIn(['media', 'letterbox'])} fullwidth={settings.getIn(['media', 'fullwidth'])} onOpenVideo={this.handleOpenVideo} - />} + />)} </Bundle> ); mediaIcon = 'video-camera'; diff --git a/app/javascript/flavours/glitch/components/status_header.js b/app/javascript/flavours/glitch/components/status_header.js index bfa996cd5..e8c7a771e 100644 --- a/app/javascript/flavours/glitch/components/status_header.js +++ b/app/javascript/flavours/glitch/components/status_header.js @@ -104,8 +104,8 @@ export default class StatusHeader extends React.PureComponent { active={collapsed} title={ collapsed ? - intl.formatMessage(messages.uncollapse) : - intl.formatMessage(messages.collapse) + intl.formatMessage(messages.uncollapse) : + intl.formatMessage(messages.collapse) } icon='angle-double-up' onClick={this.handleCollapsedClick} diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 1a258c7e4..767e4da47 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -64,11 +64,11 @@ export default class Header extends ImmutablePureComponent { <div className='account__header' style={{ backgroundImage: `url(${account.get('header')})` }}> <div> <a - href={account.get('url')} - className='account__header__avatar' - role='presentation' - target='_blank' - rel='noopener' + href={account.get('url')} + className='account__header__avatar' + role='presentation' + target='_blank' + rel='noopener' > <Avatar account={account} size={90} /> </a> diff --git a/app/javascript/flavours/glitch/features/account_gallery/index.js b/app/javascript/flavours/glitch/features/account_gallery/index.js index 951e019e3..df66b3b21 100644 --- a/app/javascript/flavours/glitch/features/account_gallery/index.js +++ b/app/javascript/flavours/glitch/features/account_gallery/index.js @@ -95,10 +95,10 @@ export default class AccountGallery extends ImmutablePureComponent { <div className='account-gallery__container'> {medias.map(media => - <MediaItem + (<MediaItem key={media.get('id')} media={media} - /> + />) )} {loadMore} </div> diff --git a/app/javascript/flavours/glitch/features/composer/upload_form/progress/index.js b/app/javascript/flavours/glitch/features/composer/upload_form/progress/index.js index 9dac6acf9..8c4b0eea6 100644 --- a/app/javascript/flavours/glitch/features/composer/upload_form/progress/index.js +++ b/app/javascript/flavours/glitch/features/composer/upload_form/progress/index.js @@ -36,10 +36,10 @@ export default function ComposerUploadFormProgress ({ progress }) { style={{ width: spring(progress) }} > {({ width }) => - <div + (<div className='tracker' style={{ width: `${width}%` }} - /> + />) } </Motion> </div> diff --git a/app/javascript/flavours/glitch/features/list_editor/index.js b/app/javascript/flavours/glitch/features/list_editor/index.js index 7f9c6b0e9..e6df4755a 100644 --- a/app/javascript/flavours/glitch/features/list_editor/index.js +++ b/app/javascript/flavours/glitch/features/list_editor/index.js @@ -67,9 +67,9 @@ export default class ListEditor extends ImmutablePureComponent { <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}> {({ x }) => - <div className='drawer__inner backdrop' style={{ transform: x === 0 ? null : `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}> + (<div className='drawer__inner backdrop' style={{ transform: x === 0 ? null : `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}> {searchAccountIds.map(accountId => <Account key={accountId} accountId={accountId} />)} - </div> + </div>) } </Motion> </div> diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.js b/app/javascript/flavours/glitch/features/ui/components/modal_root.js index a3e734867..e12ee1761 100644 --- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js +++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.js @@ -124,7 +124,7 @@ export default class ModalRoot extends React.PureComponent { (<BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}> {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />} </BundleContainer>) : - null + null } </div> </div> diff --git a/app/javascript/flavours/glitch/features/ui/components/upload_area.js b/app/javascript/flavours/glitch/features/ui/components/upload_area.js index cc6b6d171..11a10baf1 100644 --- a/app/javascript/flavours/glitch/features/ui/components/upload_area.js +++ b/app/javascript/flavours/glitch/features/ui/components/upload_area.js @@ -38,12 +38,12 @@ export default class UploadArea extends React.PureComponent { return ( <Motion defaultStyle={{ backgroundOpacity: 0, backgroundScale: 0.95 }} style={{ backgroundOpacity: spring(active ? 1 : 0, { stiffness: 150, damping: 15 }), backgroundScale: spring(active ? 1 : 0.95, { stiffness: 200, damping: 3 }) }}> {({ backgroundOpacity, backgroundScale }) => - <div className='upload-area' style={{ visibility: active ? 'visible' : 'hidden', opacity: backgroundOpacity }}> + (<div className='upload-area' style={{ visibility: active ? 'visible' : 'hidden', opacity: backgroundOpacity }}> <div className='upload-area__drop'> <div className='upload-area__background' style={{ transform: `scale(${backgroundScale})` }} /> <div className='upload-area__content'><FormattedMessage id='upload_area.title' defaultMessage='Drag & drop to upload' /></div> </div> - </div> + </div>) } </Motion> ); diff --git a/app/javascript/flavours/glitch/util/bio_metadata.js b/app/javascript/flavours/glitch/util/bio_metadata.js index 599ec20e2..3c9c2b8b1 100644 --- a/app/javascript/flavours/glitch/util/bio_metadata.js +++ b/app/javascript/flavours/glitch/util/bio_metadata.js @@ -97,8 +97,8 @@ const rexstr = exp => '(?:' + exp.source + ')'; const DOCUMENT_START = /^/; const DOCUMENT_END = /$/; const ALLOWED_CHAR = unirex( // `c-printable` in the YAML 1.2 spec. - compat_mode ? '[\t\n\r\x20-\x7e\x85\xa0-\ufffd]' : '[\t\n\r\x20-\x7e\x85\xa0-\ud7ff\ue000-\ufffd\u{10000}-\u{10FFFF}]' - ); + compat_mode ? '[\t\n\r\x20-\x7e\x85\xa0-\ufffd]' : '[\t\n\r\x20-\x7e\x85\xa0-\ud7ff\ue000-\ufffd\u{10000}-\u{10FFFF}]' +); const WHITE_SPACE = /[ \t]/; const LINE_BREAK = /\r?\n|\r|<br\s*\/?>/; const INDICATOR = /[-?:,[\]{}&#*!|>'"%@`]/; diff --git a/app/javascript/flavours/glitch/util/url_regex.js b/app/javascript/flavours/glitch/util/url_regex.js index e676d1879..faed22169 100644 --- a/app/javascript/flavours/glitch/util/url_regex.js +++ b/app/javascript/flavours/glitch/util/url_regex.js @@ -40,7 +40,7 @@ export const urlRegex = (function() { regexen.validSubdomain = regexSupplant(/(?:(?:#{validDomainChars}(?:[_-]|#{validDomainChars})*)?#{validDomainChars}\.)/); regexen.validDomainName = regexSupplant(/(?:(?:#{validDomainChars}(?:-|#{validDomainChars})*)?#{validDomainChars}\.)/); regexen.validGTLD = regexSupplant(RegExp( - '(?:(?:' + + '(?:(?:' + '삼성|닷컴|닷넷|香格里拉|餐厅|食品|飞利浦|電訊盈科|集团|通販|购物|谷歌|诺基亚|联通|网络|网站|网店|网址|组织机构|移动|珠宝|点看|游戏|淡马锡|机构|書籍|时尚|新闻|政府|' + '政务|手表|手机|我爱你|慈善|微博|广东|工行|家電|娱乐|天主教|大拿|大众汽车|在线|嘉里大酒店|嘉里|商标|商店|商城|公益|公司|八卦|健康|信息|佛山|企业|中文网|中信|世界|' + 'ポイント|ファッション|セール|ストア|コム|グーグル|クラウド|みんな|คอม|संगठन|नेट|कॉम|همراه|موقع|موبايلي|كوم|كاثوليك|عرب|شبكة|' + @@ -131,7 +131,7 @@ export const urlRegex = (function() { 'academy|abudhabi|abogado|able|abc|abbvie|abbott|abb|abarth|aarp|aaa|onion' + ')(?=[^0-9a-zA-Z@]|$))')); regexen.validCCTLD = regexSupplant(RegExp( - '(?:(?:' + + '(?:(?:' + '한국|香港|澳門|新加坡|台灣|台湾|中國|中国|გე|ไทย|ලංකා|ഭാരതം|ಭಾರತ|భారత్|சிங்கப்பூர்|இலங்கை|இந்தியா|ଭାରତ|ભારત|ਭਾਰਤ|' + 'ভাৰত|ভারত|বাংলা|भारोत|भारतम्|भारत|ڀارت|پاکستان|مليسيا|مصر|قطر|فلسطين|عمان|عراق|سورية|سودان|تونس|' + 'بھارت|بارت|ایران|امارات|المغرب|السعودية|الجزائر|الاردن|հայ|қаз|укр|срб|рф|мон|мкд|ею|бел|бг|ελ|' + @@ -169,7 +169,7 @@ export const urlRegex = (function() { ')' + ')' + '\\)' - , 'i'); + , 'i'); // Valid end-of-path chracters (so /foo. does not gobble the period). // 1. Allow =&# for empty URL parameters and other URL-join artifacts regexen.validUrlPathEndingChars = regexSupplant(/[^#{spaces_group}\(\)\?!\*';:=\,\.\$%\[\]#{pd}~&\|@]|(?:#{validUrlBalancedParens})/i); @@ -191,6 +191,6 @@ export const urlRegex = (function() { '(\\/#{validUrlPath}*)?' + // $5 URL Path '(\\?#{validUrlQueryChars}*#{validUrlQueryEndingChars})?' + // $6 Query String ')' - , 'gi'); + , 'gi'); return regexen.validUrl; }()); |