Skip to content

Commit

Permalink
Merge branch 'master' into RC-3.5.48
Browse files Browse the repository at this point in the history
  • Loading branch information
Devendra committed Nov 7, 2013
2 parents 39f0300 + 36fbc63 commit a819e25
Show file tree
Hide file tree
Showing 14 changed files with 53 additions and 39 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
node_modules
javascript.iml
*.js-e
Expand Down
7 changes: 4 additions & 3 deletions core/pubnub-common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -873,8 +874,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions modern/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -874,8 +875,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions node.js/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -874,8 +875,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions phonegap/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -874,8 +875,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions sencha/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -874,8 +875,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions smart-tv/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -1024,8 +1025,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions titanium/examples/desktop/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -875,8 +876,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions titanium/examples/mobile/chat-example-app/Resources/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -875,8 +876,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions titanium/examples/mobile/detailed-history-example-app/Resources/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -875,8 +876,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions titanium/examples/mobile/here-now-example-app/Resources/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -875,8 +876,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions titanium/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -875,8 +876,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions web/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -1024,8 +1025,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down
7 changes: 4 additions & 3 deletions webos/pubnub.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,8 @@ function PN_API(setup) {
'channel' : encode(channel),
'timestamp' : timestamp
};
if (ttl > -1) data['ttl'] = ttl

if (ttl > -1) data['ttl'] = ttl;
if (auth_key) data['auth'] = encode(auth_key);

xdr({
Expand Down Expand Up @@ -874,8 +875,8 @@ function PN_API(setup) {

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

if (channel) data['channel'] = encode(channel)
if (auth_key) data['auth'] = encode(auth_key)
if (channel) data['channel'] = encode(channel);
if (auth_key) data['auth'] = encode(auth_key);

xdr({
callback : jsonp,
Expand Down

0 comments on commit a819e25

Please sign in to comment.