upgraded socket.io to 3.4 plus added fixes to javascript 3.4 with bug…

…s on minified version.
pubnub · Dec 15, 2012 · 50e1fe7 · 50e1fe7
1 parent 2055a41
commit 50e1fe7
Show file tree

Hide file tree

Showing 115 changed files with 3,970 additions and 42 deletions.
diff --git a/javascript/3.4/pubnub-3.4.js b/javascript/3.4/pubnub-3.4.js
@@ -695,18 +695,18 @@ var PDIV          = $('pubnub') || {}
                 if (!presence) return;
 
                 // Subscribe Presence Channel
-                SELF.subscribe({
+                SELF['subscribe']({
-                    channel  : channel + PRESENCE_SUFFIX,
+                    'channel'  : channel + PRESENCE_SUFFIX,
-                    callback : presence
+                    'callback' : presence
                 });
 
                 // Presence Subscribed?
                 if (settings.subscribed) return;
 
                 // See Who's Here Now
                 SELF['here_now']({
-                    channel  : channel,
+                    'channel'  : channel,
-                    callback : function(here) {
+                    'callback' : function(here) {
                         each( 'uuids' in here ? here['uuids'] : [],
                         function(uuid) { presence( {
                             'action'    : 'join',
@@ -965,7 +965,10 @@ function FDomainRequest() {
 }
 FDomainRequest['id'] = SECOND;
 
-// For Testling.js - http://testling.com/
+// jQuery Interface
-typeof module !== 'undefined' && (module['exports'] = PUBNUB) && ready();
+window['jQuery'] && (window['jQuery']['PUBNUB'] = PUBNUB);
+
+// For Modern JS + Testling.js - http://testling.com/
+typeof(module) !== 'undefined' && (module['exports'] = PUBNUB) && ready();
 
 })();
diff --git a/javascript/3.4/pubnub-3.4.min.js b/javascript/3.4/pubnub-3.4.min.js
diff --git a/javascript/3.4/pubnub-3.4.min.js.gz b/javascript/3.4/pubnub-3.4.min.js.gz
diff --git a/javascript/build-minify-pubnub b/javascript/build-minify-pubnub
@@ -11,7 +11,9 @@ echo -e "  USING: $googleminify TO MINIFY..."
 echo -e "  COMPILING PUBNUB JAVASCRIPT API..."
 
 cat ./json.js ./pubnub-3.4.js > ./pubnub.tmp
-java -jar $googleminify --js=./pubnub.tmp --compilation_level=ADVANCED_OPTIMIZATIONS > ./pubnub-3.4.min.js
+echo "(function(){" > ./pubnub-3.4.min.js
+java -jar $googleminify --js=./pubnub.tmp --compilation_level=ADVANCED_OPTIMIZATIONS >> ./pubnub-3.4.min.js
+echo "})();" >> ./pubnub-3.4.min.js
 
 echo -e "  >>COMPRESSING<< PUBNUB JAVASCRIPT API..."
 cat ./pubnub-3.4.min.js | gzip -c9 > ./pubnub-3.4.min.js.gz

diff --git a/javascript/pubnub-3.4.js b/javascript/pubnub-3.4.js
@@ -695,18 +695,18 @@ var PDIV          = $('pubnub') || {}
                 if (!presence) return;
 
                 // Subscribe Presence Channel
-                SELF.subscribe({
+                SELF['subscribe']({
-                    channel  : channel + PRESENCE_SUFFIX,
+                    'channel'  : channel + PRESENCE_SUFFIX,
-                    callback : presence
+                    'callback' : presence
                 });
 
                 // Presence Subscribed?
                 if (settings.subscribed) return;
 
                 // See Who's Here Now
                 SELF['here_now']({
-                    channel  : channel,
+                    'channel'  : channel,
-                    callback : function(here) {
+                    'callback' : function(here) {
                         each( 'uuids' in here ? here['uuids'] : [],
                         function(uuid) { presence( {
                             'action'    : 'join',
@@ -968,7 +968,7 @@ FDomainRequest['id'] = SECOND;
 // jQuery Interface
 window['jQuery'] && (window['jQuery']['PUBNUB'] = PUBNUB);
 
-// For Testling.js - http://testling.com/
+// For Modern JS + Testling.js - http://testling.com/
-typeof module !== 'undefined' && (module.exports = PUBNUB) && ready();
+typeof(module) !== 'undefined' && (module['exports'] = PUBNUB) && ready();
 
 })();