about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorcwm <chriswmartin@protonmail.com>2017-12-09 15:15:11 -0600
committercwm <chriswmartin@protonmail.com>2017-12-09 15:15:11 -0600
commit8606e5338476cb7de21cb611d015e966f1cf48cc (patch)
treea00f8426247886e26678d82124db0b85cec59665 /app/javascript/flavours/glitch
parentfbd2a0127cb537e91508032a87bc82675f88d271 (diff)
moved locales to glitch, created add settings entry
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r--app/javascript/flavours/glitch/features/local_settings/page/index.js9
-rw-r--r--app/javascript/flavours/glitch/features/ui/index.js2
-rw-r--r--app/javascript/flavours/glitch/reducers/local_settings.js1
3 files changed, 12 insertions, 0 deletions
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 62bf410c6..b9b00b050 100644
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js
@@ -59,6 +59,15 @@ export default class LocalSettingsPage extends React.PureComponent {
         >
           <FormattedMessage id='settings.navbar_under' defaultMessage='Navbar at the bottom (Mobile only)' />
         </LocalSettingsPageItem>
+        <LocalSettingsPageItem
+          settings={settings}
+          item={['favourite_modal']}
+          id='mastodon-settings--favourite_modal'
+          onChange={onChange}
+        >
+          <FormattedMessage id='settings.favourite_modal' defaultMessage='Show confirmation dialog before favouriting' />
+        </LocalSettingsPageItem>
+
         <section>
           <h2><FormattedMessage id='settings.compose_box_opts' defaultMessage='Compose box options' /></h2>
           <LocalSettingsPageItem
diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js
index 4a1982916..1e8de033c 100644
--- a/app/javascript/flavours/glitch/features/ui/index.js
+++ b/app/javascript/flavours/glitch/features/ui/index.js
@@ -57,6 +57,7 @@ const mapStateToProps = state => ({
   layout: state.getIn(['local_settings', 'layout']),
   isWide: state.getIn(['local_settings', 'stretch']),
   navbarUnder: state.getIn(['local_settings', 'navbar_under']),
+  favouriteModal: state.getIn(['local_settings', 'favourite_modal']),
 });
 
 const keyMap = {
@@ -103,6 +104,7 @@ export default class UI extends React.Component {
     isWide: PropTypes.bool,
     systemFontUi: PropTypes.bool,
     navbarUnder: PropTypes.bool,
+    favouriteModal: PropTypes.bool,
     isComposing: PropTypes.bool,
     hasComposingText: PropTypes.bool,
     location: PropTypes.object,
diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js
index 69d98741b..e4cdc49ee 100644
--- a/app/javascript/flavours/glitch/reducers/local_settings.js
+++ b/app/javascript/flavours/glitch/reducers/local_settings.js
@@ -9,6 +9,7 @@ const initialState = ImmutableMap({
   layout    : 'auto',
   stretch   : true,
   navbar_under : false,
+  favourite_modal : false,
   side_arm  : 'none',
   collapsed : ImmutableMap({
     enabled     : true,