Skip to content

Commit 2698d8c

Browse files
author
Jakub Szwacz
committed
Merge branch 'release/2.4.16'
2 parents 2fdb019 + fb6a9b0 commit 2698d8c

4 files changed

Lines changed: 9 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## Changelog
22

3+
### 2.4.16 (29.07.2016)
4+
- Bugfix for `logout()` method
5+
36
### 2.4.15 (28.07.2016)
47
- Added `logout()` method [#41](https://github.com/filepicker/filepicker-js/pull/41)
58

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.15
1+
2.4.16

src/library/lib.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
filepicker.extend(function(){
55
var fp = this,
6-
VERSION = '2.4.15';
6+
VERSION = '2.4.16';
77
fp.API_VERSION = 'v2';
88

99
var setKey = function(key) {
@@ -752,6 +752,7 @@ filepicker.extend(function(){
752752
fp.ajax.get(fp.urls.LOGOUT, {
753753
success: options.onSuccess,
754754
error: options.onError,
755+
withCredentials: true
755756
});
756757
};
757758

src/server/ajax.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ filepicker.extend('ajax', function(){
171171
data = null;
172172
}
173173

174-
xhr.withCredentials = true;
174+
if (options.withCredentials) {
175+
xhr.withCredentials = true;
176+
}
175177

176178
xhr.open(method, url, async);
177179
if (options.json) {

0 commit comments

Comments
 (0)