Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit fe2fec0

Browse filesBrowse files
author
Devendra
committed
merged from branch
2 parents 728af82 + 9dacb9f commit fe2fec0
Copy full SHA for fe2fec0

File tree

Expand file treeCollapse file tree

23 files changed

+425
-359
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

23 files changed

+425
-359
lines changed
Open diff view settings
Collapse file

‎core/pubnub-common.js‎

Copy file name to clipboardExpand all lines: core/pubnub-common.js
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ function generate_channel_groups_list(channel_groups, nopresence) {
198198
var list = [];
199199
each(channel_groups, function( channel_group, status ) {
200200
if (nopresence) {
201-
if(channel.search('-pnpres') < 0) {
201+
if(channel_group.search('-pnpres') < 0) {
202202
if (status.subscribed) list.push(channel_group);
203203
}
204204
} else {
@@ -394,7 +394,10 @@ function PN_API(setup) {
394394

395395
clearTimeout(PRESENCE_HB_TIMEOUT);
396396

397-
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 || PRESENCE_HB_INTERVAL < 1 || !generate_channel_list(CHANNELS,true).length){
397+
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 ||
398+
PRESENCE_HB_INTERVAL < 1 ||
399+
(!generate_channel_list(CHANNELS,true).length && !generate_channel_groups_list(CHANNEL_GROUPS, true).length ) )
400+
{
398401
PRESENCE_HB_RUNNING = false;
399402
return;
400403
}
Collapse file

‎modern/pubnub.js‎

Copy file name to clipboardExpand all lines: modern/pubnub.js
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function generate_channel_groups_list(channel_groups, nopresence) {
199199
var list = [];
200200
each(channel_groups, function( channel_group, status ) {
201201
if (nopresence) {
202-
if(channel.search('-pnpres') < 0) {
202+
if(channel_group.search('-pnpres') < 0) {
203203
if (status.subscribed) list.push(channel_group);
204204
}
205205
} else {
@@ -395,7 +395,10 @@ function PN_API(setup) {
395395

396396
clearTimeout(PRESENCE_HB_TIMEOUT);
397397

398-
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 || PRESENCE_HB_INTERVAL < 1 || !generate_channel_list(CHANNELS,true).length){
398+
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 ||
399+
PRESENCE_HB_INTERVAL < 1 ||
400+
(!generate_channel_list(CHANNELS,true).length && !generate_channel_groups_list(CHANNEL_GROUPS, true).length ) )
401+
{
399402
PRESENCE_HB_RUNNING = false;
400403
return;
401404
}
Collapse file

‎modern/pubnub.min.js‎

Copy file name to clipboardExpand all lines: modern/pubnub.min.js
+32-32Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎node.js/pubnub.js‎

Copy file name to clipboardExpand all lines: node.js/pubnub.js
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function generate_channel_groups_list(channel_groups, nopresence) {
199199
var list = [];
200200
each(channel_groups, function( channel_group, status ) {
201201
if (nopresence) {
202-
if(channel.search('-pnpres') < 0) {
202+
if(channel_group.search('-pnpres') < 0) {
203203
if (status.subscribed) list.push(channel_group);
204204
}
205205
} else {
@@ -395,7 +395,10 @@ function PN_API(setup) {
395395

396396
clearTimeout(PRESENCE_HB_TIMEOUT);
397397

398-
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 || PRESENCE_HB_INTERVAL < 1 || !generate_channel_list(CHANNELS,true).length){
398+
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 ||
399+
PRESENCE_HB_INTERVAL < 1 ||
400+
(!generate_channel_list(CHANNELS,true).length && !generate_channel_groups_list(CHANNEL_GROUPS, true).length ) )
401+
{
399402
PRESENCE_HB_RUNNING = false;
400403
return;
401404
}
Collapse file

‎phonegap/pubnub.js‎

Copy file name to clipboardExpand all lines: phonegap/pubnub.js
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function generate_channel_groups_list(channel_groups, nopresence) {
199199
var list = [];
200200
each(channel_groups, function( channel_group, status ) {
201201
if (nopresence) {
202-
if(channel.search('-pnpres') < 0) {
202+
if(channel_group.search('-pnpres') < 0) {
203203
if (status.subscribed) list.push(channel_group);
204204
}
205205
} else {
@@ -395,7 +395,10 @@ function PN_API(setup) {
395395

396396
clearTimeout(PRESENCE_HB_TIMEOUT);
397397

398-
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 || PRESENCE_HB_INTERVAL < 1 || !generate_channel_list(CHANNELS,true).length){
398+
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 ||
399+
PRESENCE_HB_INTERVAL < 1 ||
400+
(!generate_channel_list(CHANNELS,true).length && !generate_channel_groups_list(CHANNEL_GROUPS, true).length ) )
401+
{
399402
PRESENCE_HB_RUNNING = false;
400403
return;
401404
}
Collapse file

‎phonegap/pubnub.min.js‎

Copy file name to clipboardExpand all lines: phonegap/pubnub.min.js
+32-32Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎sencha/pubnub.js‎

Copy file name to clipboardExpand all lines: sencha/pubnub.js
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function generate_channel_groups_list(channel_groups, nopresence) {
199199
var list = [];
200200
each(channel_groups, function( channel_group, status ) {
201201
if (nopresence) {
202-
if(channel.search('-pnpres') < 0) {
202+
if(channel_group.search('-pnpres') < 0) {
203203
if (status.subscribed) list.push(channel_group);
204204
}
205205
} else {
@@ -395,7 +395,10 @@ function PN_API(setup) {
395395

396396
clearTimeout(PRESENCE_HB_TIMEOUT);
397397

398-
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 || PRESENCE_HB_INTERVAL < 1 || !generate_channel_list(CHANNELS,true).length){
398+
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 ||
399+
PRESENCE_HB_INTERVAL < 1 ||
400+
(!generate_channel_list(CHANNELS,true).length && !generate_channel_groups_list(CHANNEL_GROUPS, true).length ) )
401+
{
399402
PRESENCE_HB_RUNNING = false;
400403
return;
401404
}
Collapse file

‎sencha/pubnub.min.js‎

Copy file name to clipboardExpand all lines: sencha/pubnub.min.js
+32-32Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎smart-tv/pubnub.js‎

Copy file name to clipboardExpand all lines: smart-tv/pubnub.js
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ function generate_channel_groups_list(channel_groups, nopresence) {
349349
var list = [];
350350
each(channel_groups, function( channel_group, status ) {
351351
if (nopresence) {
352-
if(channel.search('-pnpres') < 0) {
352+
if(channel_group.search('-pnpres') < 0) {
353353
if (status.subscribed) list.push(channel_group);
354354
}
355355
} else {
@@ -545,7 +545,10 @@ function PN_API(setup) {
545545

546546
clearTimeout(PRESENCE_HB_TIMEOUT);
547547

548-
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 || PRESENCE_HB_INTERVAL < 1 || !generate_channel_list(CHANNELS,true).length){
548+
if (!PRESENCE_HB_INTERVAL || PRESENCE_HB_INTERVAL >= 500 ||
549+
PRESENCE_HB_INTERVAL < 1 ||
550+
(!generate_channel_list(CHANNELS,true).length && !generate_channel_groups_list(CHANNEL_GROUPS, true).length ) )
551+
{
549552
PRESENCE_HB_RUNNING = false;
550553
return;
551554
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.