Skip to content

Commit ca7ea34

Browse files
author
Devendra
committed
extract channel, callback , error from pnmessage
1 parent 37febd3 commit ca7ea34

21 files changed

Lines changed: 178 additions & 160 deletions

File tree

‎core/pubnub-common.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -697,12 +697,14 @@ function PN_API(setup) {
697697
});
698698
*/
699699
'publish' : function( args, callback ) {
700-
var callback = callback || args['callback'] || function(){}
701-
, msg = args['message']
702-
, channel = args['channel']
700+
var msg = args['message'];
701+
if (!msg) return error('Missing Message');
702+
703+
var callback = callback || args['callback'] || msg['callback'] || function(){}
704+
, channel = args['channel'] || msg['channel']
703705
, auth_key = args['auth_key'] || AUTH_KEY
704706
, cipher_key = args['cipher_key']
705-
, err = args['error'] || function() {}
707+
, err = args['error'] || msg['error'] || function() {}
706708
, post = args['post'] || false
707709
, store = ('store_in_history' in args) ? args['store_in_history']: true
708710
, jsonp = jsonp_cb()
@@ -711,7 +713,6 @@ function PN_API(setup) {
711713

712714
if (args['prepend']) add_msg = 'unshift'
713715

714-
if (!msg) return error('Missing Message');
715716
if (!channel) return error('Missing Channel');
716717
if (!PUBLISH_KEY) return error('Missing Publish Key');
717718
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');

‎modern/pubnub.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,14 @@ function PN_API(setup) {
698698
});
699699
*/
700700
'publish' : function( args, callback ) {
701-
var callback = callback || args['callback'] || function(){}
702-
, msg = args['message']
703-
, channel = args['channel']
701+
var msg = args['message'];
702+
if (!msg) return error('Missing Message');
703+
704+
var callback = callback || args['callback'] || msg['callback'] || function(){}
705+
, channel = args['channel'] || msg['channel']
704706
, auth_key = args['auth_key'] || AUTH_KEY
705707
, cipher_key = args['cipher_key']
706-
, err = args['error'] || function() {}
708+
, err = args['error'] || msg['error'] || function() {}
707709
, post = args['post'] || false
708710
, store = ('store_in_history' in args) ? args['store_in_history']: true
709711
, jsonp = jsonp_cb()
@@ -712,7 +714,6 @@ function PN_API(setup) {
712714

713715
if (args['prepend']) add_msg = 'unshift'
714716

715-
if (!msg) return error('Missing Message');
716717
if (!channel) return error('Missing Channel');
717718
if (!PUBLISH_KEY) return error('Missing Publish Key');
718719
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');

‎modern/pubnub.min.js‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node.js/examples/pn_message.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,8 @@ pubnub.publish({
6666
'callback' : console.log,
6767
'error' : console.log
6868
});
69+
70+
71+
// and this also works
72+
73+
pubnub.publish({'message' : c});

‎node.js/pubnub.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,14 @@ function PN_API(setup) {
698698
});
699699
*/
700700
'publish' : function( args, callback ) {
701-
var callback = callback || args['callback'] || function(){}
702-
, msg = args['message']
703-
, channel = args['channel']
701+
var msg = args['message'];
702+
if (!msg) return error('Missing Message');
703+
704+
var callback = callback || args['callback'] || msg['callback'] || function(){}
705+
, channel = args['channel'] || msg['channel']
704706
, auth_key = args['auth_key'] || AUTH_KEY
705707
, cipher_key = args['cipher_key']
706-
, err = args['error'] || function() {}
708+
, err = args['error'] || msg['error'] || function() {}
707709
, post = args['post'] || false
708710
, store = ('store_in_history' in args) ? args['store_in_history']: true
709711
, jsonp = jsonp_cb()
@@ -712,7 +714,6 @@ function PN_API(setup) {
712714

713715
if (args['prepend']) add_msg = 'unshift'
714716

715-
if (!msg) return error('Missing Message');
716717
if (!channel) return error('Missing Channel');
717718
if (!PUBLISH_KEY) return error('Missing Publish Key');
718719
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');

‎phonegap/pubnub.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,14 @@ function PN_API(setup) {
698698
});
699699
*/
700700
'publish' : function( args, callback ) {
701-
var callback = callback || args['callback'] || function(){}
702-
, msg = args['message']
703-
, channel = args['channel']
701+
var msg = args['message'];
702+
if (!msg) return error('Missing Message');
703+
704+
var callback = callback || args['callback'] || msg['callback'] || function(){}
705+
, channel = args['channel'] || msg['channel']
704706
, auth_key = args['auth_key'] || AUTH_KEY
705707
, cipher_key = args['cipher_key']
706-
, err = args['error'] || function() {}
708+
, err = args['error'] || msg['error'] || function() {}
707709
, post = args['post'] || false
708710
, store = ('store_in_history' in args) ? args['store_in_history']: true
709711
, jsonp = jsonp_cb()
@@ -712,7 +714,6 @@ function PN_API(setup) {
712714

713715
if (args['prepend']) add_msg = 'unshift'
714716

715-
if (!msg) return error('Missing Message');
716717
if (!channel) return error('Missing Channel');
717718
if (!PUBLISH_KEY) return error('Missing Publish Key');
718719
if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');

0 commit comments

Comments
 (0)