|
@@ -385,7 +385,7 @@
|
|
_converse.log('Error while fetching bookmarks', Strophe.LogLevel.WARN);
|
|
_converse.log('Error while fetching bookmarks', Strophe.LogLevel.WARN);
|
|
_converse.log(iq.outerHTML, Strophe.LogLevel.DEBUG);
|
|
_converse.log(iq.outerHTML, Strophe.LogLevel.DEBUG);
|
|
if (!_.isNil(deferred)) {
|
|
if (!_.isNil(deferred)) {
|
|
- return deferred.reject();
|
|
|
|
|
|
+ return deferred.reject(new Error("Could not fetch bookmarks"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -517,10 +517,13 @@
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
_converse.bookmarks = new _converse.Bookmarks();
|
|
_converse.bookmarks = new _converse.Bookmarks();
|
|
- _converse.bookmarks.fetchBookmarks().then(function () {
|
|
|
|
|
|
+ _converse.bookmarks.fetchBookmarks().then(() => {
|
|
_converse.bookmarksview = new _converse.BookmarksView(
|
|
_converse.bookmarksview = new _converse.BookmarksView(
|
|
{'model': _converse.bookmarks}
|
|
{'model': _converse.bookmarks}
|
|
);
|
|
);
|
|
|
|
+ })
|
|
|
|
+ .catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR))
|
|
|
|
+ .then(() => {
|
|
_converse.emit('bookmarksInitialized');
|
|
_converse.emit('bookmarksInitialized');
|
|
});
|
|
});
|
|
};
|
|
};
|