Skip to content

Commit 4bde40a

Browse files
KevinGruberpstadler
authored andcommitted
FIX SSR (#2)
* fixssr Move 'removeListener' and 'addlistener' from util.js to Lightbox.js; add checks for 'window'
1 parent a3a1de7 commit 4bde40a

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/LightBox.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, {Component} from 'react'
33
import PaymentPageFrame from './PaymentPageFrame'
44
import {
55
filterProps, toUrlParams, parseUrl,
6-
removeListener, addListener, lockScrolling,
6+
lockScrolling,
77
releaseLock
88
} from './utils'
99

@@ -49,12 +49,14 @@ export default class LightBox extends Component {
4949
this.props.onCancelled()
5050
}
5151

52-
componentDidMount() {
53-
addListener('message', this.onMessage)
52+
componentDidMount() {
53+
const addListener = window.addEventListener || window.attachEvent
54+
addListener('message', this.onMessage)
5455
}
5556

56-
componentWillUnmount() {
57-
removeListener('message', this.onMessage)
57+
componentWillUnmount() {
58+
const removeListener = window.removeEventListener || window.detachEvent
59+
removeListener('message', this.onMessage)
5860
releaseLock()
5961
}
6062

@@ -95,4 +97,4 @@ LightBox.defaultProps = {
9597
theme: 'DT2015',
9698
version: '1.0.2',
9799
showsPaymentPage: true,
98-
}
100+
}

src/utils.js

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ export const parseUrl = url => {
2525
return a
2626
}
2727

28-
export const removeListener = window.removeEventListener || window.detachEvent
29-
export const addListener = window.addEventListener || window.attachEvent
30-
3128
export const lockScrolling = () => {
3229
var element = document.createElement('style')
3330
element.innerHTML = styles.scrollLock

0 commit comments

Comments
 (0)