Skip to content

Commit 4cd6d66

Browse files
committed
Merge branch 'develop' of https://github.com/QuickBlox/quickblox-javascript-sdk into develop
Conflicts: quickblox.min.js
2 parents 2bab94e + fb9a6a3 commit 4cd6d66

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

js/modules/qbChat.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -328,22 +328,22 @@ ChatProxy.prototype = {
328328

329329
switch (status) {
330330
case Strophe.Status.ERROR:
331-
err = getError(422, 'Status.ERROR - An error has occurred');
331+
err = Utils.getError(422, 'Status.ERROR - An error has occurred');
332332
if (typeof callback === 'function') callback(err, null);
333333
break;
334334
case Strophe.Status.CONNECTING:
335335
Utils.QBLog('[ChatProxy]', 'Status.CONNECTING');
336336
Utils.QBLog('[ChatProxy]', 'Chat Protocol - ' + (config.chatProtocol.active === 1 ? 'BOSH' : 'WebSocket'));
337337
break;
338338
case Strophe.Status.CONNFAIL:
339-
err = getError(422, 'Status.CONNFAIL - The connection attempt failed');
339+
err = Utils.getError(422, 'Status.CONNFAIL - The connection attempt failed');
340340
if (typeof callback === 'function') callback(err, null);
341341
break;
342342
case Strophe.Status.AUTHENTICATING:
343343
Utils.QBLog('[ChatProxy]', 'Status.AUTHENTICATING');
344344
break;
345345
case Strophe.Status.AUTHFAIL:
346-
err = getError(401, 'Status.AUTHFAIL - The authentication attempt failed');
346+
err = Utils.getError(401, 'Status.AUTHFAIL - The authentication attempt failed');
347347
if (typeof callback === 'function') callback(err, null);
348348
break;
349349
case Strophe.Status.CONNECTED:
@@ -1001,7 +1001,7 @@ PrivacyListProxy.prototype = {
10011001
var errorObject = getErrorFromXMLNode(stanzaError);
10021002
callback(errorObject, null);
10031003
}else{
1004-
callback(getError(408), null);
1004+
callback(Utils.getError(408), null);
10051005
}
10061006
});
10071007
},
@@ -1041,7 +1041,7 @@ PrivacyListProxy.prototype = {
10411041
var errorObject = getErrorFromXMLNode(stanzaError);
10421042
callback(errorObject, null);
10431043
}else{
1044-
callback(getError(408), null);
1044+
callback(Utils.getError(408), null);
10451045
}
10461046
});
10471047
},
@@ -1105,7 +1105,7 @@ PrivacyListProxy.prototype = {
11051105
var errorObject = getErrorFromXMLNode(stanzaError);
11061106
callback(errorObject);
11071107
}else{
1108-
callback(getError(408));
1108+
callback(Utils.getError(408));
11091109
}
11101110
});
11111111
},
@@ -1154,7 +1154,7 @@ PrivacyListProxy.prototype = {
11541154
var errorObject = getErrorFromXMLNode(stanzaError);
11551155
callback(errorObject);
11561156
}else{
1157-
callback(getError(408));
1157+
callback(Utils.getError(408));
11581158
}
11591159
});
11601160
},
@@ -1177,7 +1177,7 @@ PrivacyListProxy.prototype = {
11771177
var errorObject = getErrorFromXMLNode(stanzaError);
11781178
callback(errorObject);
11791179
}else{
1180-
callback(getError(408));
1180+
callback(Utils.getError(408));
11811181
}
11821182
});
11831183
},
@@ -1200,7 +1200,7 @@ PrivacyListProxy.prototype = {
12001200
var errorObject = getErrorFromXMLNode(stanzaError);
12011201
callback(errorObject);
12021202
}else{
1203-
callback(getError(408));
1203+
callback(Utils.getError(408));
12041204
}
12051205
});
12061206
}
@@ -1407,7 +1407,7 @@ function getErrorFromXMLNode(stanzaError) {
14071407
var errorElement = stanzaError.getElementsByTagName('error')[0];
14081408
var errorCode = parseInt(errorElement.getAttribute('code'));
14091409
var errorText = errorElement.getElementsByTagName('text')[0].textContent;
1410-
return getError(errorCode, errorText);
1410+
return Utils.getError(errorCode, errorText);
14111411
}
14121412

14131413
function getLocalTime() {

0 commit comments

Comments
 (0)