forked from ppfun/pixelplanet
Merge branch 'devel'
This commit is contained in:
commit
b7d2d43d3e
|
@ -119,6 +119,7 @@ persistStore(store, {}, () => {
|
|||
|
||||
(function load() {
|
||||
const onLoad = () => {
|
||||
window.name = 'main';
|
||||
renderApp(document.getElementById('app'), store);
|
||||
|
||||
const onKeyPress = createKeyPressHandler(store);
|
||||
|
|
|
@ -9,6 +9,7 @@ import { HiArrowsExpand, HiStop } from 'react-icons/hi';
|
|||
|
||||
import { getLinkDesc } from '../core/utils';
|
||||
import EMBEDS from './embeds';
|
||||
import { isPopUp } from './windows/popUpAvailable';
|
||||
|
||||
const titleAllowed = [
|
||||
'odysee',
|
||||
|
@ -27,8 +28,13 @@ const MdLink = ({ href, title, refEmbed }) => {
|
|||
// treat pixelplanet links seperately
|
||||
if (desc === window.location.hostname && href.includes('/#')) {
|
||||
const coords = href.substring(href.indexOf('/#') + 1);
|
||||
if (isPopUp() && window.opener && !window.opener.closed) {
|
||||
return (
|
||||
<a href={`/${coords}`} target="main">{title || coords}</a>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<a href={`./${coords}`}>{title || coords}</a>
|
||||
<a href={`/${coords}`}>{title || coords}</a>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ function createKeyPressHandler(store) {
|
|||
return;
|
||||
case 'm':
|
||||
store.dispatch(toggleMute());
|
||||
store.dispatch(notify((store.getState().audio.mute)
|
||||
store.dispatch(notify((store.getState().gui.mute)
|
||||
? t`Muted Sound`
|
||||
: t`Unmuted Sound`));
|
||||
return;
|
||||
|
|
|
@ -24,7 +24,11 @@ class PopUps {
|
|||
if (~pos) this.wins.splice(pos, 1);
|
||||
}
|
||||
|
||||
dispatch(msg) {
|
||||
/*
|
||||
* send message to all popups
|
||||
* except the ignore one
|
||||
*/
|
||||
dispatch(msg, ignore = null) {
|
||||
const { wins } = this;
|
||||
try {
|
||||
for (let i = 0; i < wins.length; i += 1) {
|
||||
|
@ -34,7 +38,9 @@ class PopUps {
|
|||
i -= 1;
|
||||
continue;
|
||||
}
|
||||
win.postMessage(msg, this.origin);
|
||||
if (win !== ignore) {
|
||||
win.postMessage(msg, this.origin);
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
return false;
|
||||
|
|
|
@ -9,7 +9,7 @@ import { load, unload } from '../actions';
|
|||
const { origin } = window.location;
|
||||
|
||||
window.addEventListener('beforeunload', () => {
|
||||
if (window.opener && !window.closed) {
|
||||
if (window.opener && !window.opener.closed) {
|
||||
window.opener.postMessage(unload(), origin);
|
||||
}
|
||||
});
|
||||
|
@ -17,7 +17,9 @@ window.addEventListener('beforeunload', () => {
|
|||
|
||||
export default (store) => (next) => (action) => {
|
||||
if (action instanceof MessageEvent) {
|
||||
if (action.origin !== origin) {
|
||||
if (action.origin !== origin
|
||||
|| !action.data.type
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
if (action.data.type === 't/UNLOAD') {
|
||||
|
|
|
@ -9,7 +9,9 @@ import popUps from '../../core/popUps';
|
|||
|
||||
export default (store) => (next) => (action) => {
|
||||
if (action instanceof MessageEvent) {
|
||||
if (action.origin !== window.location.origin) {
|
||||
if (action.origin !== window.location.origin
|
||||
|| !action.data.type
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
if (action.data.type === 't/UNLOAD') {
|
||||
|
@ -23,6 +25,8 @@ export default (store) => (next) => (action) => {
|
|||
);
|
||||
popUps.add(action.source);
|
||||
console.log('popup added');
|
||||
} else if (action.data.type.startsWith('s/')) {
|
||||
popUps.dispatch(action.data, action.source);
|
||||
}
|
||||
return next(action.data);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user