Skip to content

Commit a4ea746

Browse files
author
Max Presman
committed
3.14.5
1 parent 16eba47 commit a4ea746

24 files changed

+167
-133
lines changed

CHANGELOG

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
3-10-16 * 3.14.5
2+
- removing publish key from mobile_gw_provision
3+
- adding meta v2 to publish
14

25
3-10-16 * 3.14.3
36
- add support of passing headers via proxy

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ PubNub for JavaScript Docs have been moved to: http://www.pubnub.com/docs/javasc
1313
## CDN Links
1414

1515
#### HTTP
16-
* http://cdn.pubnub.com/pubnub-3.14.4.min.js
17-
* http://cdn.pubnub.com/pubnub-3.14.4.js
16+
* http://cdn.pubnub.com/pubnub-3.14.5.min.js
17+
* http://cdn.pubnub.com/pubnub-3.14.5.js
1818

1919
#### HTTPS
20-
* https://cdn.pubnub.com/pubnub-3.14.4.min.js
21-
* https://cdn.pubnub.com/pubnub-3.14.4.js
20+
* https://cdn.pubnub.com/pubnub-3.14.5.min.js
21+
* https://cdn.pubnub.com/pubnub-3.14.5.js

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.14.4
1+
3.14.5

bower.json

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

core/src/pubnub-common.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@ function PN_API(setup) {
911911

912912
var callback = callback || args['callback'] || msg['callback'] || args['success'] || function () {};
913913
var channel = args['channel'] || msg['channel'];
914+
var meta = args['meta'] || args['metadata'];
914915
var auth_key = args['auth_key'] || AUTH_KEY;
915916
var cipher_key = args['cipher_key'];
916917
var err = args['error'] || msg['error'] || function () {};
@@ -944,6 +945,10 @@ function PN_API(setup) {
944945

945946
params = { uuid: UUID, auth: auth_key };
946947

948+
if (meta && typeof meta === 'object') {
949+
params['meta'] = JSON.stringify(meta);
950+
}
951+
947952
if (!store) params['store'] = '0';
948953

949954
if (USE_INSTANCEID) params['instanceid'] = INSTANCEID;
@@ -1711,7 +1716,6 @@ function PN_API(setup) {
17111716
if (!gw_type) return error('Missing GW Type (gw_type: gcm or apns)');
17121717
if (!op) return error('Missing GW Operation (op: add or remove)');
17131718
if (!channel) return error('Missing gw destination Channel (channel)');
1714-
if (!PUBLISH_KEY) return error('Missing Publish Key');
17151719
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
17161720

17171721
// Create URL

modern/dist/pubnub.js

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 3.14.4 / modern */
1+
/*! 3.14.5 / modern */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -407,7 +407,7 @@ return /******/ (function(modules) { // webpackBootstrap
407407
module.exports = {
408408
"name": "pubnub",
409409
"preferGlobal": false,
410-
"version": "3.14.4",
410+
"version": "3.14.5",
411411
"author": "PubNub <[email protected]>",
412412
"description": "Publish & Subscribe Real-time Messaging with PubNub",
413413
"contributors": [
@@ -709,15 +709,14 @@ return /******/ (function(modules) { // webpackBootstrap
709709

710710
if (PRESENCE_HB === 2) PRESENCE_HB_INTERVAL = 1;
711711

712-
var crypto_obj = setup['crypto_obj'] ||
713-
{
714-
encrypt: function (a, key) {
715-
return a;
716-
},
717-
decrypt: function (b, key) {
718-
return b;
719-
}
720-
};
712+
var crypto_obj = setup['crypto_obj'] || {
713+
encrypt: function (a, key) {
714+
return a;
715+
},
716+
decrypt: function (b, key) {
717+
return b;
718+
}
719+
};
721720

722721
function _get_url_params(data) {
723722
if (!data) data = {};
@@ -1416,6 +1415,7 @@ return /******/ (function(modules) { // webpackBootstrap
14161415

14171416
var callback = callback || args['callback'] || msg['callback'] || args['success'] || function () {};
14181417
var channel = args['channel'] || msg['channel'];
1418+
var meta = args['meta'] || args['metadata'];
14191419
var auth_key = args['auth_key'] || AUTH_KEY;
14201420
var cipher_key = args['cipher_key'];
14211421
var err = args['error'] || msg['error'] || function () {};
@@ -1449,6 +1449,10 @@ return /******/ (function(modules) { // webpackBootstrap
14491449

14501450
params = { uuid: UUID, auth: auth_key };
14511451

1452+
if (meta && typeof meta === 'object') {
1453+
params['meta'] = JSON.stringify(meta);
1454+
}
1455+
14521456
if (!store) params['store'] = '0';
14531457

14541458
if (USE_INSTANCEID) params['instanceid'] = INSTANCEID;
@@ -2216,7 +2220,6 @@ return /******/ (function(modules) { // webpackBootstrap
22162220
if (!gw_type) return error('Missing GW Type (gw_type: gcm or apns)');
22172221
if (!op) return error('Missing GW Operation (op: add or remove)');
22182222
if (!channel) return error('Missing gw destination Channel (channel)');
2219-
if (!PUBLISH_KEY) return error('Missing Publish Key');
22202223
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
22212224

22222225
// Create URL

modern/dist/pubnub.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modern/pubnub.js

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 3.14.4 / modern */
1+
/*! 3.14.5 / modern */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -407,7 +407,7 @@ return /******/ (function(modules) { // webpackBootstrap
407407
module.exports = {
408408
"name": "pubnub",
409409
"preferGlobal": false,
410-
"version": "3.14.4",
410+
"version": "3.14.5",
411411
"author": "PubNub <[email protected]>",
412412
"description": "Publish & Subscribe Real-time Messaging with PubNub",
413413
"contributors": [
@@ -709,15 +709,14 @@ return /******/ (function(modules) { // webpackBootstrap
709709

710710
if (PRESENCE_HB === 2) PRESENCE_HB_INTERVAL = 1;
711711

712-
var crypto_obj = setup['crypto_obj'] ||
713-
{
714-
encrypt: function (a, key) {
715-
return a;
716-
},
717-
decrypt: function (b, key) {
718-
return b;
719-
}
720-
};
712+
var crypto_obj = setup['crypto_obj'] || {
713+
encrypt: function (a, key) {
714+
return a;
715+
},
716+
decrypt: function (b, key) {
717+
return b;
718+
}
719+
};
721720

722721
function _get_url_params(data) {
723722
if (!data) data = {};
@@ -1416,6 +1415,7 @@ return /******/ (function(modules) { // webpackBootstrap
14161415

14171416
var callback = callback || args['callback'] || msg['callback'] || args['success'] || function () {};
14181417
var channel = args['channel'] || msg['channel'];
1418+
var meta = args['meta'] || args['metadata'];
14191419
var auth_key = args['auth_key'] || AUTH_KEY;
14201420
var cipher_key = args['cipher_key'];
14211421
var err = args['error'] || msg['error'] || function () {};
@@ -1449,6 +1449,10 @@ return /******/ (function(modules) { // webpackBootstrap
14491449

14501450
params = { uuid: UUID, auth: auth_key };
14511451

1452+
if (meta && typeof meta === 'object') {
1453+
params['meta'] = JSON.stringify(meta);
1454+
}
1455+
14521456
if (!store) params['store'] = '0';
14531457

14541458
if (USE_INSTANCEID) params['instanceid'] = INSTANCEID;
@@ -2216,7 +2220,6 @@ return /******/ (function(modules) { // webpackBootstrap
22162220
if (!gw_type) return error('Missing GW Type (gw_type: gcm or apns)');
22172221
if (!op) return error('Missing GW Operation (op: add or remove)');
22182222
if (!channel) return error('Missing gw destination Channel (channel)');
2219-
if (!PUBLISH_KEY) return error('Missing Publish Key');
22202223
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
22212224

22222225
// Create URL

modern/pubnub.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pubnub",
33
"preferGlobal": false,
4-
"version": "3.14.4",
4+
"version": "3.14.5",
55
"author": "PubNub <[email protected]>",
66
"description": "Publish & Subscribe Real-time Messaging with PubNub",
77
"contributors": [

parse/dist/pubnub.js

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 3.14.4 / parse */
1+
/*! 3.14.5 / parse */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory(require("crypto"), require("buffer"));
@@ -288,7 +288,7 @@ return /******/ (function(modules) { // webpackBootstrap
288288
module.exports = {
289289
"name": "pubnub",
290290
"preferGlobal": false,
291-
"version": "3.14.4",
291+
"version": "3.14.5",
292292
"author": "PubNub <[email protected]>",
293293
"description": "Publish & Subscribe Real-time Messaging with PubNub",
294294
"contributors": [
@@ -590,15 +590,14 @@ return /******/ (function(modules) { // webpackBootstrap
590590

591591
if (PRESENCE_HB === 2) PRESENCE_HB_INTERVAL = 1;
592592

593-
var crypto_obj = setup['crypto_obj'] ||
594-
{
595-
encrypt: function (a, key) {
596-
return a;
597-
},
598-
decrypt: function (b, key) {
599-
return b;
600-
}
601-
};
593+
var crypto_obj = setup['crypto_obj'] || {
594+
encrypt: function (a, key) {
595+
return a;
596+
},
597+
decrypt: function (b, key) {
598+
return b;
599+
}
600+
};
602601

603602
function _get_url_params(data) {
604603
if (!data) data = {};
@@ -1297,6 +1296,7 @@ return /******/ (function(modules) { // webpackBootstrap
12971296

12981297
var callback = callback || args['callback'] || msg['callback'] || args['success'] || function () {};
12991298
var channel = args['channel'] || msg['channel'];
1299+
var meta = args['meta'] || args['metadata'];
13001300
var auth_key = args['auth_key'] || AUTH_KEY;
13011301
var cipher_key = args['cipher_key'];
13021302
var err = args['error'] || msg['error'] || function () {};
@@ -1330,6 +1330,10 @@ return /******/ (function(modules) { // webpackBootstrap
13301330

13311331
params = { uuid: UUID, auth: auth_key };
13321332

1333+
if (meta && typeof meta === 'object') {
1334+
params['meta'] = JSON.stringify(meta);
1335+
}
1336+
13331337
if (!store) params['store'] = '0';
13341338

13351339
if (USE_INSTANCEID) params['instanceid'] = INSTANCEID;
@@ -2097,7 +2101,6 @@ return /******/ (function(modules) { // webpackBootstrap
20972101
if (!gw_type) return error('Missing GW Type (gw_type: gcm or apns)');
20982102
if (!op) return error('Missing GW Operation (op: add or remove)');
20992103
if (!channel) return error('Missing gw destination Channel (channel)');
2100-
if (!PUBLISH_KEY) return error('Missing Publish Key');
21012104
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
21022105

21032106
// Create URL

parse/dist/pubnub.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phonegap/dist/pubnub.js

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 3.14.4 / phonegap */
1+
/*! 3.14.5 / phonegap */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -407,7 +407,7 @@ return /******/ (function(modules) { // webpackBootstrap
407407
module.exports = {
408408
"name": "pubnub",
409409
"preferGlobal": false,
410-
"version": "3.14.4",
410+
"version": "3.14.5",
411411
"author": "PubNub <[email protected]>",
412412
"description": "Publish & Subscribe Real-time Messaging with PubNub",
413413
"contributors": [
@@ -709,15 +709,14 @@ return /******/ (function(modules) { // webpackBootstrap
709709

710710
if (PRESENCE_HB === 2) PRESENCE_HB_INTERVAL = 1;
711711

712-
var crypto_obj = setup['crypto_obj'] ||
713-
{
714-
encrypt: function (a, key) {
715-
return a;
716-
},
717-
decrypt: function (b, key) {
718-
return b;
719-
}
720-
};
712+
var crypto_obj = setup['crypto_obj'] || {
713+
encrypt: function (a, key) {
714+
return a;
715+
},
716+
decrypt: function (b, key) {
717+
return b;
718+
}
719+
};
721720

722721
function _get_url_params(data) {
723722
if (!data) data = {};
@@ -1416,6 +1415,7 @@ return /******/ (function(modules) { // webpackBootstrap
14161415

14171416
var callback = callback || args['callback'] || msg['callback'] || args['success'] || function () {};
14181417
var channel = args['channel'] || msg['channel'];
1418+
var meta = args['meta'] || args['metadata'];
14191419
var auth_key = args['auth_key'] || AUTH_KEY;
14201420
var cipher_key = args['cipher_key'];
14211421
var err = args['error'] || msg['error'] || function () {};
@@ -1449,6 +1449,10 @@ return /******/ (function(modules) { // webpackBootstrap
14491449

14501450
params = { uuid: UUID, auth: auth_key };
14511451

1452+
if (meta && typeof meta === 'object') {
1453+
params['meta'] = JSON.stringify(meta);
1454+
}
1455+
14521456
if (!store) params['store'] = '0';
14531457

14541458
if (USE_INSTANCEID) params['instanceid'] = INSTANCEID;
@@ -2216,7 +2220,6 @@ return /******/ (function(modules) { // webpackBootstrap
22162220
if (!gw_type) return error('Missing GW Type (gw_type: gcm or apns)');
22172221
if (!op) return error('Missing GW Operation (op: add or remove)');
22182222
if (!channel) return error('Missing gw destination Channel (channel)');
2219-
if (!PUBLISH_KEY) return error('Missing Publish Key');
22202223
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
22212224

22222225
// Create URL

phonegap/dist/pubnub.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sencha/dist/pubnub.js

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 3.14.4 / sencha */
1+
/*! 3.14.5 / sencha */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -407,7 +407,7 @@ return /******/ (function(modules) { // webpackBootstrap
407407
module.exports = {
408408
"name": "pubnub",
409409
"preferGlobal": false,
410-
"version": "3.14.4",
410+
"version": "3.14.5",
411411
"author": "PubNub <[email protected]>",
412412
"description": "Publish & Subscribe Real-time Messaging with PubNub",
413413
"contributors": [
@@ -709,15 +709,14 @@ return /******/ (function(modules) { // webpackBootstrap
709709

710710
if (PRESENCE_HB === 2) PRESENCE_HB_INTERVAL = 1;
711711

712-
var crypto_obj = setup['crypto_obj'] ||
713-
{
714-
encrypt: function (a, key) {
715-
return a;
716-
},
717-
decrypt: function (b, key) {
718-
return b;
719-
}
720-
};
712+
var crypto_obj = setup['crypto_obj'] || {
713+
encrypt: function (a, key) {
714+
return a;
715+
},
716+
decrypt: function (b, key) {
717+
return b;
718+
}
719+
};
721720

722721
function _get_url_params(data) {
723722
if (!data) data = {};
@@ -1416,6 +1415,7 @@ return /******/ (function(modules) { // webpackBootstrap
14161415

14171416
var callback = callback || args['callback'] || msg['callback'] || args['success'] || function () {};
14181417
var channel = args['channel'] || msg['channel'];
1418+
var meta = args['meta'] || args['metadata'];
14191419
var auth_key = args['auth_key'] || AUTH_KEY;
14201420
var cipher_key = args['cipher_key'];
14211421
var err = args['error'] || msg['error'] || function () {};
@@ -1449,6 +1449,10 @@ return /******/ (function(modules) { // webpackBootstrap
14491449

14501450
params = { uuid: UUID, auth: auth_key };
14511451

1452+
if (meta && typeof meta === 'object') {
1453+
params['meta'] = JSON.stringify(meta);
1454+
}
1455+
14521456
if (!store) params['store'] = '0';
14531457

14541458
if (USE_INSTANCEID) params['instanceid'] = INSTANCEID;
@@ -2216,7 +2220,6 @@ return /******/ (function(modules) { // webpackBootstrap
22162220
if (!gw_type) return error('Missing GW Type (gw_type: gcm or apns)');
22172221
if (!op) return error('Missing GW Operation (op: add or remove)');
22182222
if (!channel) return error('Missing gw destination Channel (channel)');
2219-
if (!PUBLISH_KEY) return error('Missing Publish Key');
22202223
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
22212224

22222225
// Create URL

sencha/dist/pubnub.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)