Skip to content

Commit a819e25

Browse files
author
Devendra
committed
Merge branch 'master' into RC-3.5.48
2 parents 39f0300 + 36fbc63 commit a819e25

File tree

14 files changed

+53
-39
lines changed

14 files changed

+53
-39
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_Store
12
node_modules
23
javascript.iml
34
*.js-e

‎core/pubnub-common.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,8 @@ function PN_API(setup) {
816816
'channel' : encode(channel),
817817
'timestamp' : timestamp
818818
};
819-
if (ttl > -1) data['ttl'] = ttl
819+
820+
if (ttl > -1) data['ttl'] = ttl;
820821
if (auth_key) data['auth'] = encode(auth_key);
821822

822823
xdr({
@@ -873,8 +874,8 @@ function PN_API(setup) {
873874

874875
var data = { 'signature' : signature, 'timestamp' : timestamp };
875876

876-
if (channel) data['channel'] = encode(channel)
877-
if (auth_key) data['auth'] = encode(auth_key)
877+
if (channel) data['channel'] = encode(channel);
878+
if (auth_key) data['auth'] = encode(auth_key);
878879

879880
xdr({
880881
callback : jsonp,

‎modern/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,8 @@ function PN_API(setup) {
817817
'channel' : encode(channel),
818818
'timestamp' : timestamp
819819
};
820-
if (ttl > -1) data['ttl'] = ttl
820+
821+
if (ttl > -1) data['ttl'] = ttl;
821822
if (auth_key) data['auth'] = encode(auth_key);
822823

823824
xdr({
@@ -874,8 +875,8 @@ function PN_API(setup) {
874875

875876
var data = { 'signature' : signature, 'timestamp' : timestamp };
876877

877-
if (channel) data['channel'] = encode(channel)
878-
if (auth_key) data['auth'] = encode(auth_key)
878+
if (channel) data['channel'] = encode(channel);
879+
if (auth_key) data['auth'] = encode(auth_key);
879880

880881
xdr({
881882
callback : jsonp,

‎node.js/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,8 @@ function PN_API(setup) {
817817
'channel' : encode(channel),
818818
'timestamp' : timestamp
819819
};
820-
if (ttl > -1) data['ttl'] = ttl
820+
821+
if (ttl > -1) data['ttl'] = ttl;
821822
if (auth_key) data['auth'] = encode(auth_key);
822823

823824
xdr({
@@ -874,8 +875,8 @@ function PN_API(setup) {
874875

875876
var data = { 'signature' : signature, 'timestamp' : timestamp };
876877

877-
if (channel) data['channel'] = encode(channel)
878-
if (auth_key) data['auth'] = encode(auth_key)
878+
if (channel) data['channel'] = encode(channel);
879+
if (auth_key) data['auth'] = encode(auth_key);
879880

880881
xdr({
881882
callback : jsonp,

‎phonegap/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,8 @@ function PN_API(setup) {
817817
'channel' : encode(channel),
818818
'timestamp' : timestamp
819819
};
820-
if (ttl > -1) data['ttl'] = ttl
820+
821+
if (ttl > -1) data['ttl'] = ttl;
821822
if (auth_key) data['auth'] = encode(auth_key);
822823

823824
xdr({
@@ -874,8 +875,8 @@ function PN_API(setup) {
874875

875876
var data = { 'signature' : signature, 'timestamp' : timestamp };
876877

877-
if (channel) data['channel'] = encode(channel)
878-
if (auth_key) data['auth'] = encode(auth_key)
878+
if (channel) data['channel'] = encode(channel);
879+
if (auth_key) data['auth'] = encode(auth_key);
879880

880881
xdr({
881882
callback : jsonp,

‎sencha/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,8 @@ function PN_API(setup) {
817817
'channel' : encode(channel),
818818
'timestamp' : timestamp
819819
};
820-
if (ttl > -1) data['ttl'] = ttl
820+
821+
if (ttl > -1) data['ttl'] = ttl;
821822
if (auth_key) data['auth'] = encode(auth_key);
822823

823824
xdr({
@@ -874,8 +875,8 @@ function PN_API(setup) {
874875

875876
var data = { 'signature' : signature, 'timestamp' : timestamp };
876877

877-
if (channel) data['channel'] = encode(channel)
878-
if (auth_key) data['auth'] = encode(auth_key)
878+
if (channel) data['channel'] = encode(channel);
879+
if (auth_key) data['auth'] = encode(auth_key);
879880

880881
xdr({
881882
callback : jsonp,

‎smart-tv/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,8 @@ function PN_API(setup) {
967967
'channel' : encode(channel),
968968
'timestamp' : timestamp
969969
};
970-
if (ttl > -1) data['ttl'] = ttl
970+
971+
if (ttl > -1) data['ttl'] = ttl;
971972
if (auth_key) data['auth'] = encode(auth_key);
972973

973974
xdr({
@@ -1024,8 +1025,8 @@ function PN_API(setup) {
10241025

10251026
var data = { 'signature' : signature, 'timestamp' : timestamp };
10261027

1027-
if (channel) data['channel'] = encode(channel)
1028-
if (auth_key) data['auth'] = encode(auth_key)
1028+
if (channel) data['channel'] = encode(channel);
1029+
if (auth_key) data['auth'] = encode(auth_key);
10291030

10301031
xdr({
10311032
callback : jsonp,

‎titanium/examples/desktop/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,8 @@ function PN_API(setup) {
818818
'channel' : encode(channel),
819819
'timestamp' : timestamp
820820
};
821-
if (ttl > -1) data['ttl'] = ttl
821+
822+
if (ttl > -1) data['ttl'] = ttl;
822823
if (auth_key) data['auth'] = encode(auth_key);
823824

824825
xdr({
@@ -875,8 +876,8 @@ function PN_API(setup) {
875876

876877
var data = { 'signature' : signature, 'timestamp' : timestamp };
877878

878-
if (channel) data['channel'] = encode(channel)
879-
if (auth_key) data['auth'] = encode(auth_key)
879+
if (channel) data['channel'] = encode(channel);
880+
if (auth_key) data['auth'] = encode(auth_key);
880881

881882
xdr({
882883
callback : jsonp,

‎titanium/examples/mobile/chat-example-app/Resources/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,8 @@ function PN_API(setup) {
818818
'channel' : encode(channel),
819819
'timestamp' : timestamp
820820
};
821-
if (ttl > -1) data['ttl'] = ttl
821+
822+
if (ttl > -1) data['ttl'] = ttl;
822823
if (auth_key) data['auth'] = encode(auth_key);
823824

824825
xdr({
@@ -875,8 +876,8 @@ function PN_API(setup) {
875876

876877
var data = { 'signature' : signature, 'timestamp' : timestamp };
877878

878-
if (channel) data['channel'] = encode(channel)
879-
if (auth_key) data['auth'] = encode(auth_key)
879+
if (channel) data['channel'] = encode(channel);
880+
if (auth_key) data['auth'] = encode(auth_key);
880881

881882
xdr({
882883
callback : jsonp,

‎titanium/examples/mobile/detailed-history-example-app/Resources/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,8 @@ function PN_API(setup) {
818818
'channel' : encode(channel),
819819
'timestamp' : timestamp
820820
};
821-
if (ttl > -1) data['ttl'] = ttl
821+
822+
if (ttl > -1) data['ttl'] = ttl;
822823
if (auth_key) data['auth'] = encode(auth_key);
823824

824825
xdr({
@@ -875,8 +876,8 @@ function PN_API(setup) {
875876

876877
var data = { 'signature' : signature, 'timestamp' : timestamp };
877878

878-
if (channel) data['channel'] = encode(channel)
879-
if (auth_key) data['auth'] = encode(auth_key)
879+
if (channel) data['channel'] = encode(channel);
880+
if (auth_key) data['auth'] = encode(auth_key);
880881

881882
xdr({
882883
callback : jsonp,

‎titanium/examples/mobile/here-now-example-app/Resources/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,8 @@ function PN_API(setup) {
818818
'channel' : encode(channel),
819819
'timestamp' : timestamp
820820
};
821-
if (ttl > -1) data['ttl'] = ttl
821+
822+
if (ttl > -1) data['ttl'] = ttl;
822823
if (auth_key) data['auth'] = encode(auth_key);
823824

824825
xdr({
@@ -875,8 +876,8 @@ function PN_API(setup) {
875876

876877
var data = { 'signature' : signature, 'timestamp' : timestamp };
877878

878-
if (channel) data['channel'] = encode(channel)
879-
if (auth_key) data['auth'] = encode(auth_key)
879+
if (channel) data['channel'] = encode(channel);
880+
if (auth_key) data['auth'] = encode(auth_key);
880881

881882
xdr({
882883
callback : jsonp,

‎titanium/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,8 @@ function PN_API(setup) {
818818
'channel' : encode(channel),
819819
'timestamp' : timestamp
820820
};
821-
if (ttl > -1) data['ttl'] = ttl
821+
822+
if (ttl > -1) data['ttl'] = ttl;
822823
if (auth_key) data['auth'] = encode(auth_key);
823824

824825
xdr({
@@ -875,8 +876,8 @@ function PN_API(setup) {
875876

876877
var data = { 'signature' : signature, 'timestamp' : timestamp };
877878

878-
if (channel) data['channel'] = encode(channel)
879-
if (auth_key) data['auth'] = encode(auth_key)
879+
if (channel) data['channel'] = encode(channel);
880+
if (auth_key) data['auth'] = encode(auth_key);
880881

881882
xdr({
882883
callback : jsonp,

‎web/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,8 @@ function PN_API(setup) {
967967
'channel' : encode(channel),
968968
'timestamp' : timestamp
969969
};
970-
if (ttl > -1) data['ttl'] = ttl
970+
971+
if (ttl > -1) data['ttl'] = ttl;
971972
if (auth_key) data['auth'] = encode(auth_key);
972973

973974
xdr({
@@ -1024,8 +1025,8 @@ function PN_API(setup) {
10241025

10251026
var data = { 'signature' : signature, 'timestamp' : timestamp };
10261027

1027-
if (channel) data['channel'] = encode(channel)
1028-
if (auth_key) data['auth'] = encode(auth_key)
1028+
if (channel) data['channel'] = encode(channel);
1029+
if (auth_key) data['auth'] = encode(auth_key);
10291030

10301031
xdr({
10311032
callback : jsonp,

‎webos/pubnub.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,8 @@ function PN_API(setup) {
817817
'channel' : encode(channel),
818818
'timestamp' : timestamp
819819
};
820-
if (ttl > -1) data['ttl'] = ttl
820+
821+
if (ttl > -1) data['ttl'] = ttl;
821822
if (auth_key) data['auth'] = encode(auth_key);
822823

823824
xdr({
@@ -874,8 +875,8 @@ function PN_API(setup) {
874875

875876
var data = { 'signature' : signature, 'timestamp' : timestamp };
876877

877-
if (channel) data['channel'] = encode(channel)
878-
if (auth_key) data['auth'] = encode(auth_key)
878+
if (channel) data['channel'] = encode(channel);
879+
if (auth_key) data['auth'] = encode(auth_key);
879880

880881
xdr({
881882
callback : jsonp,

0 commit comments

Comments
 (0)