Skip to content

Commit e1b0bb6

Browse files
author
Devendra
committed
fixed issue where unsusbcribe callback was not getting invoked
1 parent c0021b6 commit e1b0bb6

22 files changed

Lines changed: 4088 additions & 141 deletions

File tree

‎core/pubnub-common.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -984,15 +984,15 @@ function PN_API(setup) {
984984
} ).join(',');
985985

986986
// Iterate over Channels
987-
each( channel.split(','), function(channel) {
987+
each( channel.split(','), function(ch) {
988988
var CB_CALLED = true;
989-
if (!channel) return;
989+
if (!ch) return;
990990
if (READY) {
991-
CB_CALLED = SELF['LEAVE']( channel, 0 , callback, err);
991+
CB_CALLED = SELF['LEAVE']( ch, 0 , callback, err);
992992
}
993993
if (!CB_CALLED) callback({action : "leave"});
994-
CHANNELS[channel] = 0;
995-
if (channel in STATE) delete STATE[channel];
994+
CHANNELS[ch] = 0;
995+
if (ch in STATE) delete STATE[ch];
996996
} );
997997
}
998998

@@ -1006,15 +1006,15 @@ function PN_API(setup) {
10061006
} ).join(',');
10071007

10081008
// Iterate over channel groups
1009-
each( channel_group.split(','), function(channel) {
1009+
each( channel_group.split(','), function(chg) {
10101010
var CB_CALLED = true;
1011-
if (!channel_group) return;
1011+
if (!chg) return;
10121012
if (READY) {
1013-
CB_CALLED = SELF['LEAVE']( channel_group, 0 , callback, err);
1013+
CB_CALLED = SELF['LEAVE']( chg, 0 , callback, err);
10141014
}
10151015
if (!CB_CALLED) callback({action : "leave"});
1016-
CHANNEL_GROUPS[channel_group] = 0;
1017-
if (channel_group in STATE) delete STATE[channel_group];
1016+
CHANNEL_GROUPS[chg] = 0;
1017+
if (chg in STATE) delete STATE[chg];
10181018
} );
10191019
}
10201020

‎modern/pubnub.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -985,15 +985,15 @@ function PN_API(setup) {
985985
} ).join(',');
986986

987987
// Iterate over Channels
988-
each( channel.split(','), function(channel) {
988+
each( channel.split(','), function(ch) {
989989
var CB_CALLED = true;
990-
if (!channel) return;
990+
if (!ch) return;
991991
if (READY) {
992-
CB_CALLED = SELF['LEAVE']( channel, 0 , callback, err);
992+
CB_CALLED = SELF['LEAVE']( ch, 0 , callback, err);
993993
}
994994
if (!CB_CALLED) callback({action : "leave"});
995-
CHANNELS[channel] = 0;
996-
if (channel in STATE) delete STATE[channel];
995+
CHANNELS[ch] = 0;
996+
if (ch in STATE) delete STATE[ch];
997997
} );
998998
}
999999

@@ -1007,15 +1007,15 @@ function PN_API(setup) {
10071007
} ).join(',');
10081008

10091009
// Iterate over channel groups
1010-
each( channel_group.split(','), function(channel) {
1010+
each( channel_group.split(','), function(chg) {
10111011
var CB_CALLED = true;
1012-
if (!channel_group) return;
1012+
if (!chg) return;
10131013
if (READY) {
1014-
CB_CALLED = SELF['LEAVE']( channel_group, 0 , callback, err);
1014+
CB_CALLED = SELF['LEAVE']( chg, 0 , callback, err);
10151015
}
10161016
if (!CB_CALLED) callback({action : "leave"});
1017-
CHANNEL_GROUPS[channel_group] = 0;
1018-
if (channel_group in STATE) delete STATE[channel_group];
1017+
CHANNEL_GROUPS[chg] = 0;
1018+
if (chg in STATE) delete STATE[chg];
10191019
} );
10201020
}
10211021

‎modern/pubnub.min.js‎

Lines changed: 2 additions & 2 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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -985,15 +985,15 @@ function PN_API(setup) {
985985
} ).join(',');
986986

987987
// Iterate over Channels
988-
each( channel.split(','), function(channel) {
988+
each( channel.split(','), function(ch) {
989989
var CB_CALLED = true;
990-
if (!channel) return;
990+
if (!ch) return;
991991
if (READY) {
992-
CB_CALLED = SELF['LEAVE']( channel, 0 , callback, err);
992+
CB_CALLED = SELF['LEAVE']( ch, 0 , callback, err);
993993
}
994994
if (!CB_CALLED) callback({action : "leave"});
995-
CHANNELS[channel] = 0;
996-
if (channel in STATE) delete STATE[channel];
995+
CHANNELS[ch] = 0;
996+
if (ch in STATE) delete STATE[ch];
997997
} );
998998
}
999999

@@ -1007,15 +1007,15 @@ function PN_API(setup) {
10071007
} ).join(',');
10081008

10091009
// Iterate over channel groups
1010-
each( channel_group.split(','), function(channel) {
1010+
each( channel_group.split(','), function(chg) {
10111011
var CB_CALLED = true;
1012-
if (!channel_group) return;
1012+
if (!chg) return;
10131013
if (READY) {
1014-
CB_CALLED = SELF['LEAVE']( channel_group, 0 , callback, err);
1014+
CB_CALLED = SELF['LEAVE']( chg, 0 , callback, err);
10151015
}
10161016
if (!CB_CALLED) callback({action : "leave"});
1017-
CHANNEL_GROUPS[channel_group] = 0;
1018-
if (channel_group in STATE) delete STATE[channel_group];
1017+
CHANNEL_GROUPS[chg] = 0;
1018+
if (chg in STATE) delete STATE[chg];
10191019
} );
10201020
}
10211021

‎phonegap/pubnub.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -985,15 +985,15 @@ function PN_API(setup) {
985985
} ).join(',');
986986

987987
// Iterate over Channels
988-
each( channel.split(','), function(channel) {
988+
each( channel.split(','), function(ch) {
989989
var CB_CALLED = true;
990-
if (!channel) return;
990+
if (!ch) return;
991991
if (READY) {
992-
CB_CALLED = SELF['LEAVE']( channel, 0 , callback, err);
992+
CB_CALLED = SELF['LEAVE']( ch, 0 , callback, err);
993993
}
994994
if (!CB_CALLED) callback({action : "leave"});
995-
CHANNELS[channel] = 0;
996-
if (channel in STATE) delete STATE[channel];
995+
CHANNELS[ch] = 0;
996+
if (ch in STATE) delete STATE[ch];
997997
} );
998998
}
999999

@@ -1007,15 +1007,15 @@ function PN_API(setup) {
10071007
} ).join(',');
10081008

10091009
// Iterate over channel groups
1010-
each( channel_group.split(','), function(channel) {
1010+
each( channel_group.split(','), function(chg) {
10111011
var CB_CALLED = true;
1012-
if (!channel_group) return;
1012+
if (!chg) return;
10131013
if (READY) {
1014-
CB_CALLED = SELF['LEAVE']( channel_group, 0 , callback, err);
1014+
CB_CALLED = SELF['LEAVE']( chg, 0 , callback, err);
10151015
}
10161016
if (!CB_CALLED) callback({action : "leave"});
1017-
CHANNEL_GROUPS[channel_group] = 0;
1018-
if (channel_group in STATE) delete STATE[channel_group];
1017+
CHANNEL_GROUPS[chg] = 0;
1018+
if (chg in STATE) delete STATE[chg];
10191019
} );
10201020
}
10211021

‎phonegap/pubnub.min.js‎

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

‎sencha/pubnub.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -985,15 +985,15 @@ function PN_API(setup) {
985985
} ).join(',');
986986

987987
// Iterate over Channels
988-
each( channel.split(','), function(channel) {
988+
each( channel.split(','), function(ch) {
989989
var CB_CALLED = true;
990-
if (!channel) return;
990+
if (!ch) return;
991991
if (READY) {
992-
CB_CALLED = SELF['LEAVE']( channel, 0 , callback, err);
992+
CB_CALLED = SELF['LEAVE']( ch, 0 , callback, err);
993993
}
994994
if (!CB_CALLED) callback({action : "leave"});
995-
CHANNELS[channel] = 0;
996-
if (channel in STATE) delete STATE[channel];
995+
CHANNELS[ch] = 0;
996+
if (ch in STATE) delete STATE[ch];
997997
} );
998998
}
999999

@@ -1007,15 +1007,15 @@ function PN_API(setup) {
10071007
} ).join(',');
10081008

10091009
// Iterate over channel groups
1010-
each( channel_group.split(','), function(channel) {
1010+
each( channel_group.split(','), function(chg) {
10111011
var CB_CALLED = true;
1012-
if (!channel_group) return;
1012+
if (!chg) return;
10131013
if (READY) {
1014-
CB_CALLED = SELF['LEAVE']( channel_group, 0 , callback, err);
1014+
CB_CALLED = SELF['LEAVE']( chg, 0 , callback, err);
10151015
}
10161016
if (!CB_CALLED) callback({action : "leave"});
1017-
CHANNEL_GROUPS[channel_group] = 0;
1018-
if (channel_group in STATE) delete STATE[channel_group];
1017+
CHANNEL_GROUPS[chg] = 0;
1018+
if (chg in STATE) delete STATE[chg];
10191019
} );
10201020
}
10211021

0 commit comments

Comments
 (0)