diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/features/local_settings/page/index.js | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/index.js | 8 | ||||
| -rw-r--r-- | app/javascript/mastodon/initial_state.js | 2 | ||||
| -rw-r--r-- | lib/mastodon/version.rb | 6 |
5 files changed, 13 insertions, 7 deletions
diff --git a/README.md b/README.md index 150b6c72b..470e379dc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ > Now with automated deploys! -[](https://travis-ci.org/glitch-soc/mastodon) +[][circleci] [circleci]: https://circleci.com/gh/glitch-soc/mastodon diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.js b/app/javascript/flavours/glitch/features/local_settings/page/index.js index 2e14c9dd5..3859c1947 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js @@ -96,7 +96,7 @@ export default class LocalSettingsPage extends React.PureComponent { </div> ), ({ intl, onChange, settings }) => ( - <div className='glitch local-settings_page compose_box_opts'> + <div className='glitch local-settings__page compose_box_opts'> <h1><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h1> <LocalSettingsPageItem settings={settings} diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js index 064804b79..ecbac1f8f 100644 --- a/app/javascript/flavours/glitch/features/ui/index.js +++ b/app/javascript/flavours/glitch/features/ui/index.js @@ -60,7 +60,8 @@ const messages = defineMessages({ }); const mapStateToProps = state => ({ - hasComposingText: state.getIn(['compose', 'text']) !== '', + hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0, + hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0, layout: state.getIn(['local_settings', 'layout']), isWide: state.getIn(['local_settings', 'stretch']), navbarUnder: state.getIn(['local_settings', 'navbar_under']), @@ -113,6 +114,7 @@ export default class UI extends React.Component { navbarUnder: PropTypes.bool, isComposing: PropTypes.bool, hasComposingText: PropTypes.bool, + hasMediaAttachments: PropTypes.bool, match: PropTypes.object.isRequired, location: PropTypes.object.isRequired, history: PropTypes.object.isRequired, @@ -128,9 +130,9 @@ export default class UI extends React.Component { }; handleBeforeUnload = (e) => { - const { intl, hasComposingText } = this.props; + const { intl, hasComposingText, hasMediaAttachments } = this.props; - if (hasComposingText) { + if (hasComposingText || hasMediaAttachments) { // Setting returnValue to any string causes confirmation dialog. // Many browsers no longer display this text to users, // but we set user-friendly message for other browsers, e.g. Edge. diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index 8751a5636..4c6922f9b 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -11,7 +11,7 @@ export const boostModal = getMeta('boost_modal'); export const deleteModal = getMeta('delete_modal'); export const me = getMeta('me'); export const searchEnabled = getMeta('search_enabled'); -export const maxChars = getMeta('max_toot_chars') || 500; +export const maxChars = (initialState && initialState.max_toot_chars) || 500; export const invitesEnabled = getMeta('invites_enabled'); export const version = getMeta('version'); diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 0442a156d..fc7fa5aca 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -28,8 +28,12 @@ module Mastodon [major, minor, patch, pre].compact end + def suffix + '+glitch' + end + def to_s - [to_a.join('.'), flags].join + [to_a.join('.'), flags, suffix].join end def repository |