Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add relationship-based options to status dropdowns (#12377)

Browse source 
Move bookmark action in inline statuses from action bar to dropdown
This commit is contained in:
Eugen Rochko 2019-11-19 21:24:16 +01:00 • committed by GitHub
parent cb3e9a2934
commit 853a67ed16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 229 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/containers/dropdown_menu_container.js
View file

@ -1,4 +1,5 @@
import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
import { fetchRelationships } from 'mastodon/actions/accounts';
import { openModal, closeModal } from '../actions/modal';
import { connect } from 'react-redux';
import DropdownMenu from '../components/dropdown_menu';
@ -13,12 +14,15 @@ const mapStateToProps = state => ({
const mapDispatchToProps = (dispatch, { status, items }) => ({
onOpen(id, onItemClick, dropdownPlacement, keyboard) {
dispatch(fetchRelationships([status.getIn(['account', 'id'])]));
dispatch(isUserTouching() ? openModal('ACTIONS', {
status,
actions: items,
onClick: onItemClick,
}) : openDropdownMenu(id, dropdownPlacement, keyboard));
},
onClose(id) {
dispatch(closeModal('ACTIONS'));
dispatch(closeDropdownMenu(id));