Skip to content
Browse files

Merge branch 'master' into RC-3.5.48

  • Loading branch information...
2 parents 39f0300 + 36fbc63 commit a819e25b8b3163ce2999a068925bd42a2174837f @devendram devendram committed Nov 7, 2013
View
1 .gitignore
@@ -1,3 +1,4 @@
+.DS_Store
node_modules
javascript.iml
*.js-e
View
7 core/pubnub-common.js
@@ -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({
@@ -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,
View
7 modern/pubnub.js
@@ -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({
@@ -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,
View
7 node.js/pubnub.js
@@ -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({
@@ -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,
View
7 phonegap/pubnub.js
@@ -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({
@@ -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,
View
7 sencha/pubnub.js
@@ -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({
@@ -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,
View
7 smart-tv/pubnub.js
@@ -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({
@@ -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,
View
7 titanium/examples/desktop/pubnub.js
@@ -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({
@@ -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,
View
7 titanium/examples/mobile/chat-example-app/Resources/pubnub.js
@@ -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({
@@ -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,
View
7 titanium/examples/mobile/detailed-history-example-app/Resources/pubnub.js
@@ -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({
@@ -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,
View
7 titanium/examples/mobile/here-now-example-app/Resources/pubnub.js
@@ -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({
@@ -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,
View
7 titanium/pubnub.js
@@ -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({
@@ -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,
View
7 web/pubnub.js
@@ -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({
@@ -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,
View
7 webos/pubnub.js
@@ -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({
@@ -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,

0 comments on commit a819e25

Please sign in to comment.
Something went wrong with that request. Please try again.