Skip to content

Commit aa48ef9

Browse files
author
Devendra
committed
merging master back to develop
2 parents f1e353a + 88a10ec commit aa48ef9

File tree

33 files changed

+8478
-1146
lines changed

33 files changed

+8478
-1146
lines changed

‎CHANGELOG

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
10-30-14 * 3.7.2
2+
. Only bower.json changes, same as 3.7.1 logic-wise
3+
4+
10-30-14 * 3.7.1 * 708e0
5+
. Channel Groups Support
6+
. Exception handling when local-storage has been disabled on the web browser
7+
. bower now pointing to versioned files
18

29
7-8-14 * 3.6.7 * 1fa0b
310
. GCM envelope support

‎Makefile.inc

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ CORE_DIR=$(REPOS_DIR)/core
66
ECHO=/bin/echo
77
PUBNUB_JS=pubnub.js
88
PUBNUB_MIN_JS=pubnub.min.js
9+
PUBNUB_VERSION_JS=pubnub-$(VERSION).js
10+
PUBNUB_VERSION_MIN_JS=pubnub-$(VERSION).min.js
911
PUBNUB_UNASSEMBLED_DIR=unassembled
1012
PUBNUB_PLATFORM_JS=$(PUBNUB_UNASSEMBLED_DIR)/platform.js
1113
JSON_JS=$(CORE_DIR)/json.js

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.0
1+
3.7.2

‎bower.json

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

‎core/pubnub-common.js

+10-37
Original file line numberDiff line numberDiff line change
@@ -595,23 +595,6 @@ function PN_API(setup) {
595595
params[key] = val;
596596
},
597597

598-
599-
'channel_group_list_namespaces' : function(args, callback) {
600-
var url = ['namespace'];
601-
602-
CR(args,callback,url);
603-
},
604-
605-
'channel_group_remove_namespace' : function(args, callback) {
606-
var namespace = args['namespace'];
607-
608-
if (!namespace) return error("Missing Namespace");
609-
610-
var url = ['namespace', encode(namespace), 'remove'];
611-
612-
CR(args,callback,url);
613-
},
614-
615598
'channel_group' : function(args, callback) {
616599
var ns_ch = args['channel_group']
617600
, channels = args['channels'] || args['channel']
@@ -622,6 +605,7 @@ function PN_API(setup) {
622605
, data = {}
623606
, mode = args['mode'] || 'add';
624607

608+
625609
if (ns_ch) {
626610
var ns_ch_a = ns_ch.split(':');
627611

@@ -664,6 +648,7 @@ function PN_API(setup) {
664648
if (namespace) {
665649
args["channel_group"] = namespace + ":*";
666650
}
651+
667652
SELF['channel_group'](args, callback);
668653
},
669654

@@ -703,27 +688,13 @@ function PN_API(setup) {
703688
SELF['channel_group'](args,callback);
704689
},
705690

706-
'channel_group_list_groups' : function(args, callback) {
707-
SELF['channel_group'](args, callback);
708-
},
709-
710-
'channel_group_list_channels' : function(args, callback) {
711-
SELF['channel_group'](args, callback);
712-
},
713691
'channel_group_list_namespaces' : function(args, callback) {
714-
SELF['channel_group'](args, callback);
692+
var url = ['namespace'];
693+
CR(args, callback, url);
715694
},
716695
'channel_group_remove_namespace' : function(args, callback) {
717-
SELF['channel_group'](args, callback);
718-
},
719-
'channel_group_add_channel' : function(args, callback) {
720-
SELF['channel_group'](args, callback);
721-
},
722-
'channel_group_remove_channel' : function(args, callback) {
723-
SELF['channel_group_remove'](args, callback);
724-
},
725-
'channel_group_remove_group' : function(args, callback) {
726-
SELF['channel_group_remove'](args, callback);
696+
var url = ['namespace',args['namespace'],'remove'];
697+
CR(args, callback, url);
727698
},
728699

729700
/*
@@ -1445,8 +1416,6 @@ function PN_API(setup) {
14451416
if (typeof channel != 'undefined'
14461417
&& CHANNELS[channel] && CHANNELS[channel].subscribed ) {
14471418
if (state) STATE[channel] = state;
1448-
} else {
1449-
channel = ',';
14501419
}
14511420

14521421
if (typeof channel_group != 'undefined'
@@ -1455,6 +1424,10 @@ function PN_API(setup) {
14551424
) {
14561425
if (state) STATE[channel_group] = state;
14571426
data['channel-group'] = channel_group;
1427+
1428+
if (!channel) {
1429+
channel = ',';
1430+
}
14581431
}
14591432

14601433
data['state'] = JSON.stringify(state);

‎modern/pubnub.js

+13-40
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Version: 3.7.0
1+
// Version: 3.7.2
22
var NOW = 1
33
, READY = false
44
, READY_BUFFER = []
@@ -12,7 +12,7 @@ var NOW = 1
1212
, PARAMSBIT = '&'
1313
, PRESENCE_HB_THRESHOLD = 5
1414
, PRESENCE_HB_DEFAULT = 30
15-
, SDK_VER = '3.7.0'
15+
, SDK_VER = '3.7.2'
1616
, REPL = /{([\w\-]+)}/g;
1717

1818
/**
@@ -596,23 +596,6 @@ function PN_API(setup) {
596596
params[key] = val;
597597
},
598598

599-
600-
'channel_group_list_namespaces' : function(args, callback) {
601-
var url = ['namespace'];
602-
603-
CR(args,callback,url);
604-
},
605-
606-
'channel_group_remove_namespace' : function(args, callback) {
607-
var namespace = args['namespace'];
608-
609-
if (!namespace) return error("Missing Namespace");
610-
611-
var url = ['namespace', encode(namespace), 'remove'];
612-
613-
CR(args,callback,url);
614-
},
615-
616599
'channel_group' : function(args, callback) {
617600
var ns_ch = args['channel_group']
618601
, channels = args['channels'] || args['channel']
@@ -623,6 +606,7 @@ function PN_API(setup) {
623606
, data = {}
624607
, mode = args['mode'] || 'add';
625608

609+
626610
if (ns_ch) {
627611
var ns_ch_a = ns_ch.split(':');
628612

@@ -665,6 +649,7 @@ function PN_API(setup) {
665649
if (namespace) {
666650
args["channel_group"] = namespace + ":*";
667651
}
652+
668653
SELF['channel_group'](args, callback);
669654
},
670655

@@ -704,27 +689,13 @@ function PN_API(setup) {
704689
SELF['channel_group'](args,callback);
705690
},
706691

707-
'channel_group_list_groups' : function(args, callback) {
708-
SELF['channel_group'](args, callback);
709-
},
710-
711-
'channel_group_list_channels' : function(args, callback) {
712-
SELF['channel_group'](args, callback);
713-
},
714692
'channel_group_list_namespaces' : function(args, callback) {
715-
SELF['channel_group'](args, callback);
693+
var url = ['namespace'];
694+
CR(args, callback, url);
716695
},
717696
'channel_group_remove_namespace' : function(args, callback) {
718-
SELF['channel_group'](args, callback);
719-
},
720-
'channel_group_add_channel' : function(args, callback) {
721-
SELF['channel_group'](args, callback);
722-
},
723-
'channel_group_remove_channel' : function(args, callback) {
724-
SELF['channel_group_remove'](args, callback);
725-
},
726-
'channel_group_remove_group' : function(args, callback) {
727-
SELF['channel_group_remove'](args, callback);
697+
var url = ['namespace',args['namespace'],'remove'];
698+
CR(args, callback, url);
728699
},
729700

730701
/*
@@ -1446,8 +1417,6 @@ function PN_API(setup) {
14461417
if (typeof channel != 'undefined'
14471418
&& CHANNELS[channel] && CHANNELS[channel].subscribed ) {
14481419
if (state) STATE[channel] = state;
1449-
} else {
1450-
channel = ',';
14511420
}
14521421

14531422
if (typeof channel_group != 'undefined'
@@ -1456,6 +1425,10 @@ function PN_API(setup) {
14561425
) {
14571426
if (state) STATE[channel_group] = state;
14581427
data['channel-group'] = channel_group;
1428+
1429+
if (!channel) {
1430+
channel = ',';
1431+
}
14591432
}
14601433

14611434
data['state'] = JSON.stringify(state);
@@ -3006,7 +2979,7 @@ THE SOFTWARE.
30062979
* UTIL LOCALS
30072980
*/
30082981
var NOW = 1
3009-
, PNSDK = 'PubNub-JS-' + 'Modern' + '/' + '3.7.0'
2982+
, PNSDK = 'PubNub-JS-' + 'Modern' + '/' + '3.7.2'
30102983
, XHRTME = 310000;
30112984

30122985

0 commit comments

Comments
 (0)