Skip to content

Commit b1898e2

Browse files
author
Devendra
committed
fixing invoke_callback for CG response format
1 parent 9b7c45d commit b1898e2

File tree

22 files changed

+694
-326
lines changed

22 files changed

+694
-326
lines changed

‎core/pubnub-common.js‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -447,25 +447,51 @@ function PN_API(setup) {
447447
}
448448
function _invoke_callback(response, callback, err) {
449449
if (typeof response == 'object') {
450-
if (response['error'] && response['message'] && response['payload']) {
451-
err({'message' : response['message'], 'payload' : response['payload']});
450+
if (response['error']) {
451+
var callback_data = {};
452+
453+
if (response['message']) {
454+
callback_data['message'] = response['message'];
455+
}
456+
457+
if (response['payload']) {
458+
callback_data['payload'] = response['payload'];
459+
}
460+
461+
err && err(callback_data);
452462
return;
463+
453464
}
454465
if (response['payload']) {
455-
callback(response['payload']);
466+
if (response['next_page'])
467+
callback && callback(response['payload'], response['next_page']);
468+
else
469+
callback && callback(response['payload']);
456470
return;
457471
}
458472
}
459-
callback(response);
473+
callback && callback(response);
460474
}
461475

462476
function _invoke_error(response,err) {
463-
if (typeof response == 'object' && response['error'] &&
464-
response['message'] && response['payload']) {
465-
err({'message' : response['message'], 'payload' : response['payload']});
466-
} else err(response);
467-
}
468477

478+
if (typeof response == 'object' && response['error']) {
479+
var callback_data = {};
480+
481+
if (response['message']) {
482+
callback_data['message'] = response['message'];
483+
}
484+
485+
if (response['payload']) {
486+
callback_data['payload'] = response['payload'];
487+
}
488+
489+
err && err(callback_data);
490+
return;
491+
} else {
492+
err && err(response);
493+
}
494+
}
469495
function CR(args, callback, url1, data) {
470496
var callback = args['callback'] || callback
471497
, err = args['error'] || error

‎modern/pubnub.js‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -448,25 +448,51 @@ function PN_API(setup) {
448448
}
449449
function _invoke_callback(response, callback, err) {
450450
if (typeof response == 'object') {
451-
if (response['error'] && response['message'] && response['payload']) {
452-
err({'message' : response['message'], 'payload' : response['payload']});
451+
if (response['error']) {
452+
var callback_data = {};
453+
454+
if (response['message']) {
455+
callback_data['message'] = response['message'];
456+
}
457+
458+
if (response['payload']) {
459+
callback_data['payload'] = response['payload'];
460+
}
461+
462+
err && err(callback_data);
453463
return;
464+
454465
}
455466
if (response['payload']) {
456-
callback(response['payload']);
467+
if (response['next_page'])
468+
callback && callback(response['payload'], response['next_page']);
469+
else
470+
callback && callback(response['payload']);
457471
return;
458472
}
459473
}
460-
callback(response);
474+
callback && callback(response);
461475
}
462476

463477
function _invoke_error(response,err) {
464-
if (typeof response == 'object' && response['error'] &&
465-
response['message'] && response['payload']) {
466-
err({'message' : response['message'], 'payload' : response['payload']});
467-
} else err(response);
468-
}
469478

479+
if (typeof response == 'object' && response['error']) {
480+
var callback_data = {};
481+
482+
if (response['message']) {
483+
callback_data['message'] = response['message'];
484+
}
485+
486+
if (response['payload']) {
487+
callback_data['payload'] = response['payload'];
488+
}
489+
490+
err && err(callback_data);
491+
return;
492+
} else {
493+
err && err(response);
494+
}
495+
}
470496
function CR(args, callback, url1, data) {
471497
var callback = args['callback'] || callback
472498
, err = args['error'] || error

‎modern/pubnub.min.js‎

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node.js/pubnub.js‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -448,25 +448,51 @@ function PN_API(setup) {
448448
}
449449
function _invoke_callback(response, callback, err) {
450450
if (typeof response == 'object') {
451-
if (response['error'] && response['message'] && response['payload']) {
452-
err({'message' : response['message'], 'payload' : response['payload']});
451+
if (response['error']) {
452+
var callback_data = {};
453+
454+
if (response['message']) {
455+
callback_data['message'] = response['message'];
456+
}
457+
458+
if (response['payload']) {
459+
callback_data['payload'] = response['payload'];
460+
}
461+
462+
err && err(callback_data);
453463
return;
464+
454465
}
455466
if (response['payload']) {
456-
callback(response['payload']);
467+
if (response['next_page'])
468+
callback && callback(response['payload'], response['next_page']);
469+
else
470+
callback && callback(response['payload']);
457471
return;
458472
}
459473
}
460-
callback(response);
474+
callback && callback(response);
461475
}
462476

463477
function _invoke_error(response,err) {
464-
if (typeof response == 'object' && response['error'] &&
465-
response['message'] && response['payload']) {
466-
err({'message' : response['message'], 'payload' : response['payload']});
467-
} else err(response);
468-
}
469478

479+
if (typeof response == 'object' && response['error']) {
480+
var callback_data = {};
481+
482+
if (response['message']) {
483+
callback_data['message'] = response['message'];
484+
}
485+
486+
if (response['payload']) {
487+
callback_data['payload'] = response['payload'];
488+
}
489+
490+
err && err(callback_data);
491+
return;
492+
} else {
493+
err && err(response);
494+
}
495+
}
470496
function CR(args, callback, url1, data) {
471497
var callback = args['callback'] || callback
472498
, err = args['error'] || error

‎phonegap/pubnub.js‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -448,25 +448,51 @@ function PN_API(setup) {
448448
}
449449
function _invoke_callback(response, callback, err) {
450450
if (typeof response == 'object') {
451-
if (response['error'] && response['message'] && response['payload']) {
452-
err({'message' : response['message'], 'payload' : response['payload']});
451+
if (response['error']) {
452+
var callback_data = {};
453+
454+
if (response['message']) {
455+
callback_data['message'] = response['message'];
456+
}
457+
458+
if (response['payload']) {
459+
callback_data['payload'] = response['payload'];
460+
}
461+
462+
err && err(callback_data);
453463
return;
464+
454465
}
455466
if (response['payload']) {
456-
callback(response['payload']);
467+
if (response['next_page'])
468+
callback && callback(response['payload'], response['next_page']);
469+
else
470+
callback && callback(response['payload']);
457471
return;
458472
}
459473
}
460-
callback(response);
474+
callback && callback(response);
461475
}
462476

463477
function _invoke_error(response,err) {
464-
if (typeof response == 'object' && response['error'] &&
465-
response['message'] && response['payload']) {
466-
err({'message' : response['message'], 'payload' : response['payload']});
467-
} else err(response);
468-
}
469478

479+
if (typeof response == 'object' && response['error']) {
480+
var callback_data = {};
481+
482+
if (response['message']) {
483+
callback_data['message'] = response['message'];
484+
}
485+
486+
if (response['payload']) {
487+
callback_data['payload'] = response['payload'];
488+
}
489+
490+
err && err(callback_data);
491+
return;
492+
} else {
493+
err && err(response);
494+
}
495+
}
470496
function CR(args, callback, url1, data) {
471497
var callback = args['callback'] || callback
472498
, err = args['error'] || error

0 commit comments

Comments
 (0)