Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Replace $.Deferred with ES2015 promises

Browse Source
This commit is contained in:
JC Brand 2017-07-11 17:21:13 +02:00
parent 16d62bf9e4
commit 6af029048d
3 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spec/bookmarks.js
View File

@ -430,8 +430,13 @@
'jid': 'another@conference.shakespeare.lit'
}).c('nick').t('JC').up().up();
_converse.connection._dataRecv(test_utils.createRequest(stanza));
expect($('#chatrooms dl.bookmarks dd').length).toBe(3);
done();
test_utils.waitUntil(function () {
return $('#chatrooms dl.bookmarks dd').length;
}, 300).then(function () {
expect($('#chatrooms dl.bookmarks dd').length).toBe(3);
done();
});
}));
it("remembers the toggle state of the bookmarks list", mock.initConverseWithPromises(
@ -472,15 +477,20 @@
'nick': ''
});
test_utils.openControlBox().openRoomsPanel(_converse);
expect($('#chatrooms dl.bookmarks dd:visible').length).toBe(1);
expect(_converse.bookmarksview.list_model.get('toggle-state')).toBe(_converse.OPENED);
$('#chatrooms .bookmarks-toggle').click();
expect($('#chatrooms dl.bookmarks dd:visible').length).toBe(0);
expect(_converse.bookmarksview.list_model.get('toggle-state')).toBe(_converse.CLOSED);
$('#chatrooms .bookmarks-toggle').click();
expect($('#chatrooms dl.bookmarks dd:visible').length).toBe(1);
expect(_converse.bookmarksview.list_model.get('toggle-state')).toBe(_converse.OPENED);
done();
test_utils.waitUntil(function () {
return $('#chatrooms dl.bookmarks dd:visible').length;
}, 300).then(function () {
expect($('#chatrooms dl.bookmarks dd:visible').length).toBe(1);
expect(_converse.bookmarksview.list_model.get('toggle-state')).toBe(_converse.OPENED);
$('#chatrooms .bookmarks-toggle').click();
expect($('#chatrooms dl.bookmarks dd:visible').length).toBe(0);
expect(_converse.bookmarksview.list_model.get('toggle-state')).toBe(_converse.CLOSED);
$('#chatrooms .bookmarks-toggle').click();
expect($('#chatrooms dl.bookmarks dd:visible').length).toBe(1);
expect(_converse.bookmarksview.list_model.get('toggle-state')).toBe(_converse.OPENED);
done();
});
}));
});
});

7
src/converse-bookmarks.js
View File

@ -229,8 +229,7 @@
},
fetchBookmarks () {
const deferred = new $.Deferred();
const promise = deferred.promise();
const deferred = utils.getWrappedPromise();
if (this.browserStorage.records.length > 0) {
this.fetch({
'success': _.bind(this.onCachedBookmarksFetched, this, deferred),
@ -245,7 +244,7 @@
} else {
deferred.resolve();
}
return promise;
return deferred.promise;
},
onCachedBookmarksFetched (deferred) {
@ -482,7 +481,7 @@
return;
}
_converse.bookmarks = new _converse.Bookmarks();
_converse.bookmarks.fetchBookmarks().always(function () {
_converse.bookmarks.fetchBookmarks().then(function () {
_converse.bookmarksview = new _converse.BookmarksView(
{'model': _converse.bookmarks}
);

32
src/utils.js
View File

@ -69,22 +69,22 @@
};
var isImage = function (url) {
var deferred = new $.Deferred();
var img = new Image();
var timer = window.setTimeout(function () {
deferred.reject();
img = null;
}, 3000);
img.onerror = img.onabort = function () {
clearTimeout(timer);
deferred.reject();
};
img.onload = function () {
clearTimeout(timer);
deferred.resolve(img);
};
img.src = url;
return deferred.promise();
return new Promise((resolve, reject) => {
var img = new Image();
var timer = window.setTimeout(function () {
reject(new Error("Could not determine whether it's an image"));
img = null;
}, 3000);
img.onerror = img.onabort = function () {
clearTimeout(timer);
reject(new Error("Could not determine whether it's an image"));
};
img.onload = function () {
clearTimeout(timer);
resolve(img);
};
img.src = url;
});
};
$.fn.hasScrollBar = function() {