Skip to content

Commit c0021b6

Browse files
author
Devendra
committed
fixed a bug where -pnpres was getting appended twice to channel name.
1 parent 8a1b49b commit c0021b6

27 files changed

Lines changed: 208 additions & 4117 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.5
1+
3.7.6

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pubnub",
3-
"version": "3.7.5",
3+
"version": "3.7.6",
44
"main": "web/pubnub.min.js",
55
"license": "https://github.com/pubnub/javascript/blob/master/LICENSE",
66
"ignore" : [ "**/*", "!web/pubnub.js", "!web/pubnub.min.js"],

core/pubnub-common.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,8 @@ function PN_API(setup) {
13561356
var chobj = {};
13571357

13581358
if (channel2) {
1359-
if (channel && channel.indexOf('-pnpres') >= 0) {
1359+
if (channel && channel.indexOf('-pnpres') >= 0
1360+
&& channel2.indexOf('-pnpres') < 0) {
13601361
channel2 += '-pnpres';
13611362
}
13621363
chobj = CHANNEL_GROUPS[channel2] || CHANNELS[channel2] || {'callback' : function(){}};

modern/pubnub.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Version: 3.7.5
1+
// Version: 3.7.6
22
var NOW = 1
33
, READY = false
44
, READY_BUFFER = []
@@ -12,7 +12,7 @@ var NOW = 1
1212
, PARAMSBIT = '&'
1313
, PRESENCE_HB_THRESHOLD = 5
1414
, PRESENCE_HB_DEFAULT = 30
15-
, SDK_VER = '3.7.5'
15+
, SDK_VER = '3.7.6'
1616
, REPL = /{([\w\-]+)}/g;
1717

1818
/**
@@ -1357,7 +1357,8 @@ function PN_API(setup) {
13571357
var chobj = {};
13581358

13591359
if (channel2) {
1360-
if (channel && channel.indexOf('-pnpres') >= 0) {
1360+
if (channel && channel.indexOf('-pnpres') >= 0
1361+
&& channel2.indexOf('-pnpres') < 0) {
13611362
channel2 += '-pnpres';
13621363
}
13631364
chobj = CHANNEL_GROUPS[channel2] || CHANNELS[channel2] || {'callback' : function(){}};
@@ -3078,7 +3079,7 @@ THE SOFTWARE.
30783079
* UTIL LOCALS
30793080
*/
30803081
var NOW = 1
3081-
, PNSDK = 'PubNub-JS-' + 'Modern' + '/' + '3.7.5'
3082+
, PNSDK = 'PubNub-JS-' + 'Modern' + '/' + '3.7.6'
30823083
, XHRTME = 310000;
30833084

30843085

modern/pubnub.min.js

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

node.js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pubnub",
33
"preferGlobal": false,
4-
"version": "3.7.5",
4+
"version": "3.7.6",
55
"author": "PubNub <stephen@pubnub.com>",
66
"description": "Publish & Subscribe Real-time Messaging with PubNub",
77
"contributors": [

node.js/pubnub.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Version: 3.7.5
1+
// Version: 3.7.6
22
var NOW = 1
33
, READY = false
44
, READY_BUFFER = []
@@ -12,7 +12,7 @@ var NOW = 1
1212
, PARAMSBIT = '&'
1313
, PRESENCE_HB_THRESHOLD = 5
1414
, PRESENCE_HB_DEFAULT = 30
15-
, SDK_VER = '3.7.5'
15+
, SDK_VER = '3.7.6'
1616
, REPL = /{([\w\-]+)}/g;
1717

1818
/**
@@ -1357,7 +1357,8 @@ function PN_API(setup) {
13571357
var chobj = {};
13581358

13591359
if (channel2) {
1360-
if (channel && channel.indexOf('-pnpres') >= 0) {
1360+
if (channel && channel.indexOf('-pnpres') >= 0
1361+
&& channel2.indexOf('-pnpres') < 0) {
13611362
channel2 += '-pnpres';
13621363
}
13631364
chobj = CHANNEL_GROUPS[channel2] || CHANNELS[channel2] || {'callback' : function(){}};
@@ -1938,7 +1939,7 @@ var NOW = 1
19381939
, XHRTME = 310000
19391940
, DEF_TIMEOUT = 10000
19401941
, SECOND = 1000
1941-
, PNSDK = 'PubNub-JS-' + 'Nodejs' + '/' + '3.7.5'
1942+
, PNSDK = 'PubNub-JS-' + 'Nodejs' + '/' + '3.7.6'
19421943
, crypto = require('crypto')
19431944
, proxy = null
19441945
, XORIGN = 1;

phonegap/pubnub.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Version: 3.7.5
1+
// Version: 3.7.6
22
var NOW = 1
33
, READY = false
44
, READY_BUFFER = []
@@ -12,7 +12,7 @@ var NOW = 1
1212
, PARAMSBIT = '&'
1313
, PRESENCE_HB_THRESHOLD = 5
1414
, PRESENCE_HB_DEFAULT = 30
15-
, SDK_VER = '3.7.5'
15+
, SDK_VER = '3.7.6'
1616
, REPL = /{([\w\-]+)}/g;
1717

1818
/**
@@ -1357,7 +1357,8 @@ function PN_API(setup) {
13571357
var chobj = {};
13581358

13591359
if (channel2) {
1360-
if (channel && channel.indexOf('-pnpres') >= 0) {
1360+
if (channel && channel.indexOf('-pnpres') >= 0
1361+
&& channel2.indexOf('-pnpres') < 0) {
13611362
channel2 += '-pnpres';
13621363
}
13631364
chobj = CHANNEL_GROUPS[channel2] || CHANNELS[channel2] || {'callback' : function(){}};
@@ -3078,7 +3079,7 @@ THE SOFTWARE.
30783079
* UTIL LOCALS
30793080
*/
30803081
var NOW = 1
3081-
, PNSDK = 'PubNub-JS-' + 'Phonegap' + '/' + '3.7.5'
3082+
, PNSDK = 'PubNub-JS-' + 'Phonegap' + '/' + '3.7.6'
30823083
, XHRTME = 310000;
30833084

30843085

0 commit comments

Comments
 (0)