Skip to content

Commit 46ccc1a

Browse files
committed
Fixes #1692
1 parent cc91f37 commit 46ccc1a

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
different path, you'll need to set `publicPath` in `webpack.config.js` to
1313
your preferred path and then rebuild all assets (e.g. `make dist`).
1414
- Use `listenTo` to avoid memory leaks when views get removed.
15+
- #1692 Bugfix: `TypeError: oldest_message is undefined`
16+
1517

1618
## 5.0.1 (2019-08-14)
1719

src/converse-mam-views.js

+14-12
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,21 @@ converse.plugins.add('converse-mam-views', {
3737
const { _converse } = this.__super__;
3838
if (this.content.scrollTop === 0 && this.model.messages.length) {
3939
const oldest_message = this.model.getOldestMessage();
40-
const by_jid = this.model.get('jid');
41-
const stanza_id = oldest_message && oldest_message.get(`stanza_id ${by_jid}`);
42-
this.addSpinner();
43-
if (stanza_id) {
44-
await this.model.fetchArchivedMessages({
45-
'before': stanza_id
46-
});
47-
} else {
48-
await this.model.fetchArchivedMessages({
49-
'end': oldest_message.get('time')
50-
});
40+
if (oldest_message) {
41+
const by_jid = this.model.get('jid');
42+
const stanza_id = oldest_message && oldest_message.get(`stanza_id ${by_jid}`);
43+
this.addSpinner();
44+
if (stanza_id) {
45+
await this.model.fetchArchivedMessages({
46+
'before': stanza_id
47+
});
48+
} else {
49+
await this.model.fetchArchivedMessages({
50+
'end': oldest_message.get('time')
51+
});
52+
}
53+
this.clearSpinner();
5154
}
52-
this.clearSpinner();
5355
}
5456
}
5557
},

0 commit comments

Comments
 (0)