maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing flag user modal (#11221)

Browse source
This commit is contained in:
Rafi 2020-11-05 20:35:37 +05:30 • committed by GitHub
parent 7047b01671
commit d80f918efa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/actionsPanel/actionsPanel.js
View file

@ -1,3 +1,4 @@
import { toggleFlagUserModal } from '../packs/flagUserModal';
import { request } from '@utilities/http';
export function addCloseListener() {
@ -403,6 +404,10 @@ export function addBottomActionsListeners() {
}
});
}
document
.getElementById('open-flag-user-modal')
.addEventListener('click', toggleFlagUserModal);
}
export function initializeActionsPanel() {

12
app/javascript/modCenter/singleArticle/index.jsx
View file

@ -1,8 +1,7 @@
import PropTypes from 'prop-types';
import { h, Component, Fragment } from 'preact';
import { createPortal } from 'preact/compat';
import { toggleFlagUserModal, FlagUserModal } from '../../packs/flagUserModal';
import { FlagUserModal } from '../../packs/flagUserModal';
import { formatDate } from './util';
export default class SingleArticle extends Component {
@ -44,15 +43,6 @@ export default class SingleArticle extends Component {
? document.getElementById(`mod-iframe-${id}`)
: document.getElementById('mod-container');
// Check whether context is ModCenter or Friday-Night-Mode
if (modContainer) {
modContainer.addEventListener('load', () => {
modContainer.contentWindow.document
.getElementById('open-flag-user-modal')
.addEventListener('click', toggleFlagUserModal);
});
}
return (
<Fragment>
{modContainer &&

20
app/javascript/packs/flagUserModal.jsx
View file

@ -50,16 +50,18 @@ async function confirmFlagUser({ reactableType, category, reactableId }) {
* Shows or hides the flag user modal.
*/
export function toggleFlagUserModal() {
const modalContainer = document.querySelector('.flag-user-modal-container');
const modalContainer = top.document.querySelector(
'.flag-user-modal-container',
);
modalContainer.classList.toggle('hidden');
if (!modalContainer.classList.contains('hidden')) {
window.scrollTo(0, 0);
document.body.style.height = '100vh';
document.body.style.overflowY = 'hidden';
top.window.scrollTo(0, 0);
top.document.body.style.height = '100vh';
top.document.body.style.overflowY = 'hidden';
} else {
document.body.style.height = 'inherit';
document.body.style.overflowY = 'inherit';
top.document.body.style.height = 'inherit';
top.document.body.style.overflowY = 'inherit';
}
}
@ -80,12 +82,6 @@ export function initializeFlagUserModal(authorId) {
<FlagUserModal authorId={authorId} />,
document.querySelector('.flag-user-modal-container'),
);
modContainer.addEventListener('load', () => {
modContainer.contentWindow.document
.getElementById('open-flag-user-modal')
.addEventListener('click', toggleFlagUserModal);
});
}
/**