Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Presman committed Oct 25, 2017
2 parents 27a789a + ecaf06d commit 33429cf
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 17 deletions.
7 changes: 6 additions & 1 deletion .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
name: javascript
version: 4.16.2
version: 4.17.0
schema: 1
scm: github.com/pubnub/javascript
files:
- dist/web/pubnub.js
- dist/web/pubnub.min.js
changelog:
- version: v4.17.0
date: 2017-10-19
changes:
- type: improvement
text: allow disabling of heartbeats by passing 0 during initialization.
- version: v4.16.2
date: 2017-10-19
changes:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@

## [v4.17.0](https://github.com/pubnub/javascript/tree/v4.17.0)
October-19-2017


[Full Changelog](https://github.com/pubnub/javascript/compare/v4.16.2...v4.17.0)


- ⭐allow disabling of heartbeats by passing 0 during initialization.



## [v4.16.2](https://github.com/pubnub/javascript/tree/v4.16.2)
October-19-2017

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
- If you **need help** or have a **general question**, contact <[email protected]>

## CDN Links
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.16.2.min.js
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.16.2.js
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.17.0.min.js
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.17.0.js
6 changes: 3 additions & 3 deletions dist/titanium/pubnub.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! 4.16.2 / Consumer */
/*! 4.17.0 / Consumer */
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
Expand Down Expand Up @@ -473,7 +473,7 @@ return /******/ (function(modules) { // webpackBootstrap

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

if (setup.heartbeatInterval) {
if (setup.heartbeatInterval != null) {
this.setHeartbeatInterval(setup.heartbeatInterval);
}

Expand Down Expand Up @@ -572,7 +572,7 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: 'getVersion',
value: function getVersion() {
return '4.16.2';
return '4.17.0';
}
}, {
key: '_decideUUID',
Expand Down
2 changes: 1 addition & 1 deletion dist/titanium/pubnub.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/web/pubnub.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! 4.16.2 / Consumer */
/*! 4.17.0 / Consumer */
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
Expand Down Expand Up @@ -495,7 +495,7 @@ return /******/ (function(modules) { // webpackBootstrap

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

if (setup.heartbeatInterval) {
if (setup.heartbeatInterval != null) {
this.setHeartbeatInterval(setup.heartbeatInterval);
}

Expand Down Expand Up @@ -594,7 +594,7 @@ return /******/ (function(modules) { // webpackBootstrap
}, {
key: 'getVersion',
value: function getVersion() {
return '4.16.2';
return '4.17.0';
}
}, {
key: '_decideUUID',
Expand Down
2 changes: 1 addition & 1 deletion dist/web/pubnub.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/core/components/config.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/core/components/config.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pubnub",
"version": "4.16.2",
"version": "4.17.0",
"author": "PubNub <[email protected]>",
"description": "Publish & Subscribe Real-time Messaging with PubNub",
"bin": {},
Expand Down
4 changes: 2 additions & 2 deletions src/core/components/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export default class {
// how long the SDK will report the client to be alive before issuing a timeout
this.setPresenceTimeout(setup.presenceTimeout || 300);

if (setup.heartbeatInterval) {
if (setup.heartbeatInterval != null) {
this.setHeartbeatInterval(setup.heartbeatInterval);
}

Expand Down Expand Up @@ -218,7 +218,7 @@ export default class {
setSendBeaconConfig(val: boolean): this { this._useSendBeacon = val; return this; }

getVersion(): string {
return '4.16.2';
return '4.17.0';
}

_decideUUID(providedUUID: string): string {
Expand Down

0 comments on commit 33429cf

Please sign in to comment.