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

---
 .../flavours/glitch/containers/status_container.js       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'app/javascript/flavours/glitch/containers/status_container.js')

diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index b753de7b3..8bf33c70f 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -20,7 +20,7 @@ import { initMuteModal } from 'flavours/glitch/actions/mutes';
 import { initReport } from 'flavours/glitch/actions/reports';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { boostModal, deleteModal } from 'flavours/glitch/util/initial_state';
+import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/util/initial_state';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -78,14 +78,22 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onFavourite (status) {
+  onModalFavourite (status) {
+    dispatch(favourite(status));
+  },
+
+  onFavourite (status, e) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
     } else {
-      dispatch(favourite(status));
+      if (e.shiftKey || !favouriteModal) {
+        this.onModalFavourite(status);
+      } else {
+        dispatch(openModal('FAVOURITE', { status, onFavourite: this.onModalFavourite }));
+      }
     }
   },
-
+  
   onPin (status) {
     if (status.get('pinned')) {
       dispatch(unpin(status));
-- 
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/containers/status_container.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