Permalink
Browse files

fixed here_now and ssl

  • Loading branch information...
1 parent 9e0fe15 commit 02761b5e348d64fb50a81b913ad47be3fe45bdaa geremy cohen committed Nov 6, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 javascript/pubnub-3.3.js
View
@@ -928,7 +928,7 @@ var PDIV = $('pubnub') || {}
if (!callback) return log('Missing Callback');
if (!SUBSCRIBE_KEY) return log('Missing Subscribe Key');
- data = null;
+ data = {};
if (jsonp != '0') { data['callback']=jsonp; }
// Send Message
@@ -976,7 +976,7 @@ var PDIV = $('pubnub') || {}
PUBNUB = CREATE_PUBNUB({
'publish_key' : attr( PDIV, 'pub-key' ),
'subscribe_key' : attr( PDIV, 'sub-key' ),
- 'ssl' : attr( PDIV, 'ssl' ) == 'on',
+ 'ssl' : attr( PDIV, 'ssl' ) == 'on' || !document.location.href.indexOf('https'),
'origin' : attr( PDIV, 'origin' ),
'uuid' : attr( PDIV, 'uuid' )
});

0 comments on commit 02761b5

Please sign in to comment.