Skip to content

Commit da472dc

Browse files
committed
[js:core] fix duplicate issue of reqid of raw XHR request
1 parent 0224a18 commit da472dc

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

js/elFinder.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ var elFinder = function(elm, opts, bootCallback) {
992992
* @type Function
993993
*/
994994
this.restoreXhrSend = function() {
995-
XMLHttpRequest.prototype.send = savedXhrSend;
995+
savedXhrSend && (XMLHttpRequest.prototype.send = savedXhrSend);
996996
};
997997

998998
/**
@@ -2113,7 +2113,9 @@ var elFinder = function(elm, opts, bootCallback) {
21132113

21142114
requestCnt++;
21152115

2116-
dfrd.fail(function(error, xhr, response) {
2116+
dfrd.always(function() {
2117+
delete options.headers['X-elFinderReqid'];
2118+
}).fail(function(error, xhr, response) {
21172119
// unset this cmd queue when user canceling
21182120
if (error === 0) {
21192121
if (requestQueue.length) {

0 commit comments

Comments
 (0)