Skip to content

Commit 9b7c45d

Browse files
author
Devendra
committed
pass real channel in callback
1 parent d272c0c commit 9b7c45d

File tree

22 files changed

+310
-226
lines changed

22 files changed

+310
-226
lines changed

‎core/pubnub-common.js‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,9 +1265,11 @@ function PN_API(setup) {
12651265
// Route Channel <---> Callback for Message
12661266
var next_callback = (function() {
12671267
var channels = '';
1268+
var channels2 = '';
12681269

12691270
if (messages.length > 3) {
1270-
channels = messages[3];
1271+
channels = messages[3];
1272+
channels2 = messages[2];
12711273
} else if (messages.length > 2) {
12721274
channels = messages[2];
12731275
} else {
@@ -1279,15 +1281,19 @@ function PN_API(setup) {
12791281
) }).join(',')
12801282
}
12811283

1282-
var list = channels.split(',');
1284+
var list = channels.split(',');
1285+
var list2 = (channels2)?channels2.split(','):[];
12831286

12841287
return function() {
1285-
var channel = list.shift()||SUB_CHANNEL;
1286-
return [
1288+
var channel = list.shift()||SUB_CHANNEL;
1289+
var channel2 = list2.shift();
1290+
var r = [
12871291
(CHANNELS[channel]||{})
12881292
.callback||SUB_CALLBACK,
12891293
channel.split(PRESENCE_SUFFIX)[0]
12901294
];
1295+
channel2 && r.push(channel2.split(PRESENCE_SUFFIX)[0]);
1296+
return r;
12911297
};
12921298
})();
12931299

@@ -1296,7 +1302,7 @@ function PN_API(setup) {
12961302
var next = next_callback();
12971303
var decrypted_msg = decrypt(msg,
12981304
(CHANNELS[next[1]])?CHANNELS[next[1]]['cipher_key']:null);
1299-
next[0]( decrypted_msg, messages, next[2] || next[1], latency);
1305+
next[0]( decrypted_msg, messages, next[2] || next[1], latency, next[1]);
13001306
});
13011307

13021308
timeout( _connect, windowing );

‎modern/pubnub.js‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,9 +1266,11 @@ function PN_API(setup) {
12661266
// Route Channel <---> Callback for Message
12671267
var next_callback = (function() {
12681268
var channels = '';
1269+
var channels2 = '';
12691270

12701271
if (messages.length > 3) {
1271-
channels = messages[3];
1272+
channels = messages[3];
1273+
channels2 = messages[2];
12721274
} else if (messages.length > 2) {
12731275
channels = messages[2];
12741276
} else {
@@ -1280,15 +1282,19 @@ function PN_API(setup) {
12801282
) }).join(',')
12811283
}
12821284

1283-
var list = channels.split(',');
1285+
var list = channels.split(',');
1286+
var list2 = (channels2)?channels2.split(','):[];
12841287

12851288
return function() {
1286-
var channel = list.shift()||SUB_CHANNEL;
1287-
return [
1289+
var channel = list.shift()||SUB_CHANNEL;
1290+
var channel2 = list2.shift();
1291+
var r = [
12881292
(CHANNELS[channel]||{})
12891293
.callback||SUB_CALLBACK,
12901294
channel.split(PRESENCE_SUFFIX)[0]
12911295
];
1296+
channel2 && r.push(channel2.split(PRESENCE_SUFFIX)[0]);
1297+
return r;
12921298
};
12931299
})();
12941300

@@ -1297,7 +1303,7 @@ function PN_API(setup) {
12971303
var next = next_callback();
12981304
var decrypted_msg = decrypt(msg,
12991305
(CHANNELS[next[1]])?CHANNELS[next[1]]['cipher_key']:null);
1300-
next[0]( decrypted_msg, messages, next[2] || next[1], latency);
1306+
next[0]( decrypted_msg, messages, next[2] || next[1], latency, next[1]);
13011307
});
13021308

13031309
timeout( _connect, windowing );

‎modern/pubnub.min.js‎

Lines changed: 19 additions & 19 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: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,9 +1266,11 @@ function PN_API(setup) {
12661266
// Route Channel <---> Callback for Message
12671267
var next_callback = (function() {
12681268
var channels = '';
1269+
var channels2 = '';
12691270

12701271
if (messages.length > 3) {
1271-
channels = messages[3];
1272+
channels = messages[3];
1273+
channels2 = messages[2];
12721274
} else if (messages.length > 2) {
12731275
channels = messages[2];
12741276
} else {
@@ -1280,15 +1282,19 @@ function PN_API(setup) {
12801282
) }).join(',')
12811283
}
12821284

1283-
var list = channels.split(',');
1285+
var list = channels.split(',');
1286+
var list2 = (channels2)?channels2.split(','):[];
12841287

12851288
return function() {
1286-
var channel = list.shift()||SUB_CHANNEL;
1287-
return [
1289+
var channel = list.shift()||SUB_CHANNEL;
1290+
var channel2 = list2.shift();
1291+
var r = [
12881292
(CHANNELS[channel]||{})
12891293
.callback||SUB_CALLBACK,
12901294
channel.split(PRESENCE_SUFFIX)[0]
12911295
];
1296+
channel2 && r.push(channel2.split(PRESENCE_SUFFIX)[0]);
1297+
return r;
12921298
};
12931299
})();
12941300

@@ -1297,7 +1303,7 @@ function PN_API(setup) {
12971303
var next = next_callback();
12981304
var decrypted_msg = decrypt(msg,
12991305
(CHANNELS[next[1]])?CHANNELS[next[1]]['cipher_key']:null);
1300-
next[0]( decrypted_msg, messages, next[2] || next[1], latency);
1306+
next[0]( decrypted_msg, messages, next[2] || next[1], latency, next[1]);
13011307
});
13021308

13031309
timeout( _connect, windowing );

‎phonegap/pubnub.js‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,9 +1266,11 @@ function PN_API(setup) {
12661266
// Route Channel <---> Callback for Message
12671267
var next_callback = (function() {
12681268
var channels = '';
1269+
var channels2 = '';
12691270

12701271
if (messages.length > 3) {
1271-
channels = messages[3];
1272+
channels = messages[3];
1273+
channels2 = messages[2];
12721274
} else if (messages.length > 2) {
12731275
channels = messages[2];
12741276
} else {
@@ -1280,15 +1282,19 @@ function PN_API(setup) {
12801282
) }).join(',')
12811283
}
12821284

1283-
var list = channels.split(',');
1285+
var list = channels.split(',');
1286+
var list2 = (channels2)?channels2.split(','):[];
12841287

12851288
return function() {
1286-
var channel = list.shift()||SUB_CHANNEL;
1287-
return [
1289+
var channel = list.shift()||SUB_CHANNEL;
1290+
var channel2 = list2.shift();
1291+
var r = [
12881292
(CHANNELS[channel]||{})
12891293
.callback||SUB_CALLBACK,
12901294
channel.split(PRESENCE_SUFFIX)[0]
12911295
];
1296+
channel2 && r.push(channel2.split(PRESENCE_SUFFIX)[0]);
1297+
return r;
12921298
};
12931299
})();
12941300

@@ -1297,7 +1303,7 @@ function PN_API(setup) {
12971303
var next = next_callback();
12981304
var decrypted_msg = decrypt(msg,
12991305
(CHANNELS[next[1]])?CHANNELS[next[1]]['cipher_key']:null);
1300-
next[0]( decrypted_msg, messages, next[2] || next[1], latency);
1306+
next[0]( decrypted_msg, messages, next[2] || next[1], latency, next[1]);
13011307
});
13021308

13031309
timeout( _connect, windowing );

0 commit comments

Comments
 (0)