Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit 2bf8517

Browse files
authored
Merge pull request #5411 from bsclifton/fix-newtab-ipc
Properly display about:newtab when session is null
2 parents e38d99d + 96dbcf9 commit 2bf8517

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

js/about/newtab.js

+13-14
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,20 @@ class NewTabPage extends React.Component {
3535
updatedStamp: undefined
3636
}
3737
ipc.on(messages.NEWTAB_DATA_UPDATED, (e, newTabData) => {
38-
this.sanitize(newTabData)
39-
})
40-
}
41-
sanitize (newTabData) {
42-
let sanitizedData = Immutable.fromJS(newTabData || {})
43-
const updatedStamp = sanitizedData.getIn(['newTabDetail', 'updatedStamp'])
44-
45-
// Only update if the data has changed.
46-
if (updatedStamp === this.state.updatedStamp) {
47-
return
48-
}
38+
const data = Immutable.fromJS(newTabData || {})
39+
const updatedStamp = data.getIn(['newTabDetail', 'updatedStamp'])
40+
41+
// Only update if the data has changed.
42+
if (typeof updatedStamp === 'number' &&
43+
typeof this.state.updatedStamp === 'number' &&
44+
updatedStamp === this.state.updatedStamp) {
45+
return
46+
}
4947

50-
this.setState({
51-
newTabData: sanitizedData,
52-
updatedStamp: updatedStamp
48+
this.setState({
49+
newTabData: data,
50+
updatedStamp: updatedStamp
51+
})
5352
})
5453
}
5554

0 commit comments

Comments
 (0)