SSL fix provided by @brettveenstra which allows SSL support with usin…

…g the JS <script> file in the <head> tags.
pubnub · Oct 8, 2012 · 80f07a6 · 80f07a6
1 parent 1073d49
commit 80f07a6
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/app-showcase/content-commander/m-commander.html b/app-showcase/content-commander/m-commander.html
@@ -191,8 +191,8 @@ <h3>
           $("#demo_info_button").click( toggleDemoInfo ); 
           $("#notifications_button").click( toggleNotifications ); 
 
-          $("#demo_info_button").touchUp( toggleDemoInfo ); 
-          $("#notifications_button").touchUp( toggleNotifications ); 
+          //$("#demo_info_button").touchUp( toggleDemoInfo ); 
+          //$("#notifications_button").touchUp( toggleNotifications ); 
         </script>
 
       </div><!-- /page #main -->
@@ -275,7 +275,7 @@ <h1>Uh-oh.</h1>
 
       <!-- PUBNUB -->
 
-      <div pub-key="pub-550ff6a3-aa50-466c-a2c7-55a6c3fa3345" sub-key="sub-f3307e99-6a4a-11e1-870f-affeca838b29" ssl="off" origin="pubsub.pubnub.com" id="pubnub"></div>
+      <div pub-key="pub-7dbb570c-16fa-4bb7-8478-b632bb510472" sub-key="sub-c9ce8494-d8b6-11e0-9367-bbbbf064f5b3" ssl="off" origin="pubsub.pubnub.com" id="pubnub"></div>
       <script src="http://cdn.pubnub.com/pubnub-3.1.min.js"></script>
       <script>(function(){
 

diff --git a/app-showcase/content-commander/package.json b/app-showcase/content-commander/package.json
@@ -1,6 +1,6 @@
 {
   "description": "a little demo",
-  "version": "1.3.0",
+  "version": "1.3.0-4",
   "dependencies": {
     "union": "0.1.7",
     "flatiron": "0.1.11",
@@ -16,4 +16,4 @@
   "engines": {
     "node": "v0.6.x"
   }
-}
+}
diff --git a/javascript/3.1/pubnub-3.1.js b/javascript/3.1/pubnub-3.1.js
@@ -872,7 +872,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' )
 });
 

diff --git a/javascript/3.2/pubnub-3.2.js b/javascript/3.2/pubnub-3.2.js
@@ -926,7 +926,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' )
 });

diff --git a/javascript/3.3/pubnub-3.3.js b/javascript/3.3/pubnub-3.3.js
@@ -971,7 +971,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' )
 });

diff --git a/javascript/3.3/pubnub-3.3.min.js b/javascript/3.3/pubnub-3.3.min.js
diff --git a/javascript/pubnub-3.3.js b/javascript/pubnub-3.3.js
@@ -971,7 +971,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' )
 });

diff --git a/javascript/pubnub-3.3.min.js b/javascript/pubnub-3.3.min.js