Skip to content

Commit dd62e0c

Browse files
author
Devendra
committed
Merge branch 'master' into develop
2 parents 2f11536 + 46cea90 commit dd62e0c

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

bower.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "pubnub",
3+
"version": "3.6.1",
4+
"main": "web/pubnub.min.js",
5+
"license": "https://github.com/pubnub/javascript/blob/master/LICENSE",
6+
"ignore" : [ "**/*", "!web/pubnub.js", "!web/pubnub.min.js"],
7+
"keywords": [
8+
"pubnub",
9+
"javascript",
10+
"realtime"
11+
]
12+
}

node.js/README.md

+13
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@ var pubnub = require("pubnub").init({
2323
subscribe_key : "demo"
2424
});
2525

26+
/* ---------------------------------------------------------------------------
27+
Publish Messages
28+
--------------------------------------------------------------------------- */
29+
var message = { "some" : "data" };
30+
pubnub.publish({
31+
channel : 'my_channel',
32+
message : message,
33+
callback : function(e) { console.log( "SUCCESS!", e ); },
34+
error : function(e) { console.log( "FAILED! RETRY PUBLISH!", e ); }
35+
});
36+
2637
/* ---------------------------------------------------------------------------
2738
Listen for Messages
2839
--------------------------------------------------------------------------- */
@@ -43,4 +54,6 @@ stdin.on( 'data', function(chunk) {
4354
message : ''+chunk
4455
});
4556
});
57+
58+
4659
```

web/examples/presenceTest350.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -759,10 +759,10 @@
759759
console.log("PN is not loaded. Trying to load.");
760760
if (clientLevel == "3.6") {
761761
if (ssl) {
762-
url = "https://s3.amazonaws.com/pubnub/pubnub-3.6.0-beta.js";
762+
url = "https://cdn.pubnub.com/pubnub-3.6.1.min.js";
763763
}
764764
else {
765-
url = "http://s3.amazonaws.com/pubnub/pubnub-3.6.0-beta.js";
765+
url = "http://cdn.pubnub.com/pubnub-3.6.1.min.js";
766766
}
767767
}
768768
else if (clientLevel == "3.5") {

0 commit comments

Comments
 (0)