Merge branch 'main' into glitch-soc/merge-upstream

master
Claire 3 years ago
commit a993ff6e2f
  1. 21
      app/javascript/mastodon/actions/picture_in_picture.js
  2. 3
      app/javascript/mastodon/reducers/picture_in_picture.js
  3. 12
      app/javascript/styles/mastodon/boost.scss
  4. 7
      app/javascript/styles/mastodon/components.scss
  5. 2
      config/webpack/production.js

@ -22,13 +22,20 @@ export const PICTURE_IN_PICTURE_REMOVE = 'PICTURE_IN_PICTURE_REMOVE';
* @param {MediaProps} props * @param {MediaProps} props
* @return {object} * @return {object}
*/ */
export const deployPictureInPicture = (statusId, accountId, playerType, props) => ({ export const deployPictureInPicture = (statusId, accountId, playerType, props) => {
type: PICTURE_IN_PICTURE_DEPLOY, return (dispatch, getState) => {
statusId, // Do not open a player for a toot that does not exist
accountId, if (getState().hasIn(['statuses', statusId])) {
playerType, dispatch({
props, type: PICTURE_IN_PICTURE_DEPLOY,
}); statusId,
accountId,
playerType,
props,
});
}
};
};
/* /*
* @return {object} * @return {object}

@ -1,4 +1,5 @@
import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'mastodon/actions/picture_in_picture'; import { PICTURE_IN_PICTURE_DEPLOY, PICTURE_IN_PICTURE_REMOVE } from 'mastodon/actions/picture_in_picture';
import { TIMELINE_DELETE } from '../actions/timelines';
const initialState = { const initialState = {
statusId: null, statusId: null,
@ -16,6 +17,8 @@ export default function pictureInPicture(state = initialState, action) {
return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props }; return { statusId: action.statusId, accountId: action.accountId, type: action.playerType, ...action.props };
case PICTURE_IN_PICTURE_REMOVE: case PICTURE_IN_PICTURE_REMOVE:
return { ...initialState }; return { ...initialState };
case TIMELINE_DELETE:
return (state.statusId === action.id) ? { ...initialState } : state;
default: default:
return state; return state;
} }

File diff suppressed because one or more lines are too long

@ -4732,6 +4732,13 @@ a.status-card.compact:hover {
background: rgba($gold-star, 0.3); background: rgba($gold-star, 0.3);
} }
} }
&.disabled {
color: $white;
background-color: transparent;
cursor: default;
opacity: 0.4;
}
} }
} }
} }

@ -43,7 +43,7 @@ module.exports = merge(sharedConfig, {
plugins: [ plugins: [
new CompressionPlugin({ new CompressionPlugin({
filename: '[path].gz[query]', filename: '[path][base].gz[query]',
cache: true, cache: true,
test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/, test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/,
}), }),

Loading…
Cancel
Save