Skip to content

Commit 33429cf

Browse files
author
Max Presman
committed
Merge branch 'develop'
2 parents 27a789a + ecaf06d commit 33429cf

11 files changed

Lines changed: 33 additions & 17 deletions

File tree

.pubnub.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
name: javascript
2-
version: 4.16.2
2+
version: 4.17.0
33
schema: 1
44
scm: github.com/pubnub/javascript
55
files:
66
- dist/web/pubnub.js
77
- dist/web/pubnub.min.js
88
changelog:
9+
- version: v4.17.0
10+
date: 2017-10-19
11+
changes:
12+
- type: improvement
13+
text: allow disabling of heartbeats by passing 0 during initialization.
914
- version: v4.16.2
1015
date: 2017-10-19
1116
changes:

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
## [v4.17.0](https://github.com/pubnub/javascript/tree/v4.17.0)
3+
October-19-2017
4+
5+
6+
[Full Changelog](https://github.com/pubnub/javascript/compare/v4.16.2...v4.17.0)
7+
8+
9+
- ⭐allow disabling of heartbeats by passing 0 during initialization.
10+
11+
12+
213
## [v4.16.2](https://github.com/pubnub/javascript/tree/v4.16.2)
314
October-19-2017
415

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
1919
- If you **need help** or have a **general question**, contact <support@pubnub.com>
2020

2121
## CDN Links
22-
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.16.2.min.js
23-
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.16.2.js
22+
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.17.0.min.js
23+
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.17.0.js

dist/titanium/pubnub.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 4.16.2 / Consumer */
1+
/*! 4.17.0 / Consumer */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -473,7 +473,7 @@ return /******/ (function(modules) { // webpackBootstrap
473473

474474
this.setPresenceTimeout(setup.presenceTimeout || 300);
475475

476-
if (setup.heartbeatInterval) {
476+
if (setup.heartbeatInterval != null) {
477477
this.setHeartbeatInterval(setup.heartbeatInterval);
478478
}
479479

@@ -572,7 +572,7 @@ return /******/ (function(modules) { // webpackBootstrap
572572
}, {
573573
key: 'getVersion',
574574
value: function getVersion() {
575-
return '4.16.2';
575+
return '4.17.0';
576576
}
577577
}, {
578578
key: '_decideUUID',

dist/titanium/pubnub.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web/pubnub.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 4.16.2 / Consumer */
1+
/*! 4.17.0 / Consumer */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -495,7 +495,7 @@ return /******/ (function(modules) { // webpackBootstrap
495495

496496
this.setPresenceTimeout(setup.presenceTimeout || 300);
497497

498-
if (setup.heartbeatInterval) {
498+
if (setup.heartbeatInterval != null) {
499499
this.setHeartbeatInterval(setup.heartbeatInterval);
500500
}
501501

@@ -594,7 +594,7 @@ return /******/ (function(modules) { // webpackBootstrap
594594
}, {
595595
key: 'getVersion',
596596
value: function getVersion() {
597-
return '4.16.2';
597+
return '4.17.0';
598598
}
599599
}, {
600600
key: '_decideUUID',

dist/web/pubnub.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/core/components/config.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.

lib/core/components/config.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.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": "4.16.2",
3+
"version": "4.17.0",
44
"author": "PubNub <support@pubnub.com>",
55
"description": "Publish & Subscribe Real-time Messaging with PubNub",
66
"bin": {},

0 commit comments

Comments
 (0)