From abe95b614b6355e61dd2955e09115ac473417c84 Mon Sep 17 00:00:00 2001
From: cwm <chriswmartin@protonmail.com>
Date: Sat, 9 Dec 2017 10:26:22 -0600
Subject: add initial components based off of tootsuite pr #1507

---
 app/javascript/flavours/glitch/features/status/index.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/status/index.js')

diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js
index 93b0fe9d9..8b81caa9a 100644
--- a/app/javascript/flavours/glitch/features/status/index.js
+++ b/app/javascript/flavours/glitch/features/status/index.js
@@ -30,7 +30,7 @@ import { openModal } from 'flavours/glitch/actions/modal';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
-import { boostModal, deleteModal } from 'flavours/glitch/util/initial_state';
+import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/util/initial_state';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from 'flavours/glitch/util/fullscreen';
 
 const messages = defineMessages({
@@ -95,11 +95,19 @@ export default class Status extends ImmutablePureComponent {
     }
   };
 
-  handleFavouriteClick = (status) => {
+  handleModalFavourite = (status) => {
+    this.props.dispatch(favourite(status));
+  }
+
+  handleFavouriteClick = (status, e) => {
     if (status.get('favourited')) {
       this.props.dispatch(unfavourite(status));
     } else {
-      this.props.dispatch(favourite(status));
+      if (e.shiftKey || !favoriteModal) {
+        this.handleModalFavourite(status);
+      } else {
+        this.props.dispatch(openModal('FAVOURITE', { status, onFavourite: this.handleModalFavourite }));
+      }
     }
   }
 
@@ -118,7 +126,7 @@ export default class Status extends ImmutablePureComponent {
   handleModalReblog = (status) => {
     this.props.dispatch(reblog(status));
   }
-
+  
   handleReblogClick = (status, e) => {
     if (status.get('reblogged')) {
       this.props.dispatch(unreblog(status));
-- 
cgit 


From 22cdbca82c06cced9568f0bd9361593a2c0eba81 Mon Sep 17 00:00:00 2001
From: cwm <chriswmartin@protonmail.com>
Date: Sat, 9 Dec 2017 12:06:00 -0600
Subject: fixes, functioning now

---
 app/javascript/flavours/glitch/components/status.js               | 2 +-
 app/javascript/flavours/glitch/components/status_action_bar.js    | 4 ++--
 app/javascript/flavours/glitch/features/status/index.js           | 2 +-
 .../flavours/glitch/features/ui/components/favourite_modal.js     | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/status/index.js')

diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index 6cfd05735..b8a0fd180 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -205,7 +205,7 @@ export default class Status extends ImmutablePureComponent {
     this.props.onReply(this.props.status, this.context.router.history);
   }
 
-  handleHotkeyFavourite = e => {
+  handleHotkeyFavourite = (e) => {
     this.props.onFavourite(this.props.status, e);
   }
 
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.js b/app/javascript/flavours/glitch/components/status_action_bar.js
index 5a06782be..cb663e773 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.js
+++ b/app/javascript/flavours/glitch/components/status_action_bar.js
@@ -71,8 +71,8 @@ export default class StatusActionBar extends ImmutablePureComponent {
     });
   }
 
-  handleFavouriteClick = () => {
-    this.props.onFavourite(this.props.status);
+  handleFavouriteClick = (e) => {
+    this.props.onFavourite(this.props.status, e);
   }
 
   handleReblogClick = (e) => {
diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js
index 8b81caa9a..4a019ce20 100644
--- a/app/javascript/flavours/glitch/features/status/index.js
+++ b/app/javascript/flavours/glitch/features/status/index.js
@@ -103,7 +103,7 @@ export default class Status extends ImmutablePureComponent {
     if (status.get('favourited')) {
       this.props.dispatch(unfavourite(status));
     } else {
-      if (e.shiftKey || !favoriteModal) {
+      if (e.shiftKey || !favouriteModal) {
         this.handleModalFavourite(status);
       } else {
         this.props.dispatch(openModal('FAVOURITE', { status, onFavourite: this.handleModalFavourite }));
diff --git a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js
index a2322d0b8..70722411d 100644
--- a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js
@@ -10,11 +10,11 @@ import DisplayName from 'flavours/glitch/components/display_name';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
-  reblog: { id: 'status.favourite', defaultMessage: 'Favourite' },
+  favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
 });
 
 @injectIntl
-export default class BoostModal extends ImmutablePureComponent {
+export default class FavouriteModal extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -22,7 +22,7 @@ export default class BoostModal extends ImmutablePureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
-    onReblog: PropTypes.func.isRequired,
+    onFavourite: PropTypes.func.isRequired,
     onClose: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
@@ -75,7 +75,7 @@ export default class BoostModal extends ImmutablePureComponent {
 
         <div className='favourite-modal__action-bar'>
           <div><FormattedMessage id='favourite_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <i className='fa fa-star' /></span> }} /></div>
-          <Button text={intl.formatMessage(messages.reblog)} onClick={this.handleReblog} ref={this.setRef} />
+          <Button text={intl.formatMessage(messages.favourite)} onClick={this.handleFavourite} ref={this.setRef} />
         </div>
       </div>
     );
-- 
cgit 


From c5a688d70e4bea57ac87c71577fd6c7b9e5fa163 Mon Sep 17 00:00:00 2001
From: cwm <chriswmartin@protonmail.com>
Date: Sat, 9 Dec 2017 12:41:24 -0600
Subject: remove trailing spaces

---
 app/javascript/flavours/glitch/containers/status_container.js         | 2 +-
 app/javascript/flavours/glitch/features/status/index.js               | 2 +-
 .../flavours/glitch/features/ui/components/actions_modal.js           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/status/index.js')

diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index 8bf33c70f..c0b9b5800 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -93,7 +93,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       }
     }
   },
-  
+
   onPin (status) {
     if (status.get('pinned')) {
       dispatch(unpin(status));
diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js
index 4a019ce20..40ae380ab 100644
--- a/app/javascript/flavours/glitch/features/status/index.js
+++ b/app/javascript/flavours/glitch/features/status/index.js
@@ -126,7 +126,7 @@ export default class Status extends ImmutablePureComponent {
   handleModalReblog = (status) => {
     this.props.dispatch(reblog(status));
   }
-  
+
   handleReblogClick = (status, e) => {
     if (status.get('reblogged')) {
       this.props.dispatch(unreblog(status));
diff --git a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js
index 1eb0e026e..87a149807 100644
--- a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js
@@ -55,7 +55,7 @@ export default class ActionsModal extends ImmutablePureComponent {
             <DisplayName account={this.props.status.get('account')} />
           </a>
         </div>
-        
+
         <div className='favourite-modal__status-header'>
           <div className='favourite-modal__status-time'>
             <a href={this.props.status.get('url')} className='status__relative-time' target='_blank' rel='noopener'>
@@ -73,7 +73,7 @@ export default class ActionsModal extends ImmutablePureComponent {
         </div>
 
         <StatusContent status={this.props.status} />
-      </div>      
+      </div>
     );
 
     return (
-- 
cgit