Skip to content

Commit 76dc94e

Browse files
author
Devendra
committed
pnmessage should take argument
1 parent ca7ea34 commit 76dc94e

14 files changed

Lines changed: 599 additions & 624 deletions

File tree

‎core/pubnub-common.js‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -196,60 +196,57 @@ function ready() { timeout( function() {
196196
each( READY_BUFFER, function(connect) { connect() } );
197197
}, SECOND ); }
198198

199-
function PNmessage() {
200-
msg = {
201-
'apns' : {},
202-
'getPubnubMessage' : function() {
203-
var m = {};
204-
205-
if (Object.keys(msg['apns']).length) {
206-
m['pn_apns'] = {
207-
'aps' : {
208-
'alert' : msg['apns']['alert'],
209-
'badge' : msg['apns']['badge']
210-
}
211-
}
212-
for (var k in msg['apns']) {
213-
m['pn_apns'][k] = msg['apns'][k];
214-
}
215-
var exclude1 = ['badge','alert'];
216-
for (var k in exclude1) {
217-
//console.log(exclude[k]);
218-
delete m['pn_apns'][exclude1[k]];
219-
}
199+
function PNmessage(args) {
200+
msg = args || {'apns' : {}},
201+
msg['getPubnubMessage'] = function() {
202+
var m = {};
203+
204+
if (Object.keys(msg['apns']).length) {
205+
m['pn_apns'] = {
206+
'aps' : {
207+
'alert' : msg['apns']['alert'] ,
208+
'badge' : msg['apns']['badge']
209+
}
210+
}
211+
for (var k in msg['apns']) {
212+
m['pn_apns'][k] = msg['apns'][k];
220213
}
214+
var exclude1 = ['badge','alert'];
215+
for (var k in exclude1) {
216+
//console.log(exclude[k]);
217+
delete m['pn_apns'][exclude1[k]];
218+
}
219+
}
221220

222221

223222

224-
if (msg['gcm']) {
225-
m['pn_gcm'] = {
226-
'data' : msg['gcm']
227-
}
228-
}
223+
if (msg['gcm']) {
224+
m['pn_gcm'] = {
225+
'data' : msg['gcm']
226+
}
227+
}
229228

230-
for (var k in msg) {
231-
m[k] = msg[k];
232-
}
233-
var exclude = ['apns','gcm','send', 'channel','callback','error'];
234-
for (var k in exclude) {
235-
//console.log(exclude[k]);
236-
delete m[exclude[k]];
237-
}
229+
for (var k in msg) {
230+
m[k] = msg[k];
231+
}
232+
var exclude = ['apns','gcm','send', 'channel','callback','error'];
233+
for (var k in exclude) {
234+
delete m[exclude[k]];
235+
}
238236

239-
return m;
240-
},
241-
'send' : function() {
242-
243-
var m = msg.getPubnubMessage();
244-
245-
if (msg['pubnub'] && msg['channel']) {
246-
msg['pubnub'].publish({
247-
'message' : m,
248-
'channel' : msg['channel'],
249-
'callback' : msg['callback'],
250-
'error' : msg['error']
251-
})
252-
}
237+
return m;
238+
};
239+
msg['send'] = function() {
240+
241+
var m = msg.getPubnubMessage();
242+
243+
if (msg['pubnub'] && msg['channel']) {
244+
msg['pubnub'].publish({
245+
'message' : m,
246+
'channel' : msg['channel'],
247+
'callback' : msg['callback'],
248+
'error' : msg['error']
249+
})
253250
}
254251
};
255252
return msg;

‎modern/pubnub.js‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -197,60 +197,57 @@ function ready() { timeout( function() {
197197
each( READY_BUFFER, function(connect) { connect() } );
198198
}, SECOND ); }
199199

200-
function PNmessage() {
201-
msg = {
202-
'apns' : {},
203-
'getPubnubMessage' : function() {
204-
var m = {};
205-
206-
if (Object.keys(msg['apns']).length) {
207-
m['pn_apns'] = {
208-
'aps' : {
209-
'alert' : msg['apns']['alert'],
210-
'badge' : msg['apns']['badge']
211-
}
212-
}
213-
for (var k in msg['apns']) {
214-
m['pn_apns'][k] = msg['apns'][k];
215-
}
216-
var exclude1 = ['badge','alert'];
217-
for (var k in exclude1) {
218-
//console.log(exclude[k]);
219-
delete m['pn_apns'][exclude1[k]];
220-
}
200+
function PNmessage(args) {
201+
msg = args || {'apns' : {}},
202+
msg['getPubnubMessage'] = function() {
203+
var m = {};
204+
205+
if (Object.keys(msg['apns']).length) {
206+
m['pn_apns'] = {
207+
'aps' : {
208+
'alert' : msg['apns']['alert'] ,
209+
'badge' : msg['apns']['badge']
210+
}
211+
}
212+
for (var k in msg['apns']) {
213+
m['pn_apns'][k] = msg['apns'][k];
221214
}
215+
var exclude1 = ['badge','alert'];
216+
for (var k in exclude1) {
217+
//console.log(exclude[k]);
218+
delete m['pn_apns'][exclude1[k]];
219+
}
220+
}
222221

223222

224223

225-
if (msg['gcm']) {
226-
m['pn_gcm'] = {
227-
'data' : msg['gcm']
228-
}
229-
}
224+
if (msg['gcm']) {
225+
m['pn_gcm'] = {
226+
'data' : msg['gcm']
227+
}
228+
}
230229

231-
for (var k in msg) {
232-
m[k] = msg[k];
233-
}
234-
var exclude = ['apns','gcm','send', 'channel','callback','error'];
235-
for (var k in exclude) {
236-
//console.log(exclude[k]);
237-
delete m[exclude[k]];
238-
}
230+
for (var k in msg) {
231+
m[k] = msg[k];
232+
}
233+
var exclude = ['apns','gcm','send', 'channel','callback','error'];
234+
for (var k in exclude) {
235+
delete m[exclude[k]];
236+
}
239237

240-
return m;
241-
},
242-
'send' : function() {
243-
244-
var m = msg.getPubnubMessage();
245-
246-
if (msg['pubnub'] && msg['channel']) {
247-
msg['pubnub'].publish({
248-
'message' : m,
249-
'channel' : msg['channel'],
250-
'callback' : msg['callback'],
251-
'error' : msg['error']
252-
})
253-
}
238+
return m;
239+
};
240+
msg['send'] = function() {
241+
242+
var m = msg.getPubnubMessage();
243+
244+
if (msg['pubnub'] && msg['channel']) {
245+
msg['pubnub'].publish({
246+
'message' : m,
247+
'channel' : msg['channel'],
248+
'callback' : msg['callback'],
249+
'error' : msg['error']
250+
})
254251
}
255252
};
256253
return msg;

‎node.js/examples/pn_message.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,17 @@ pubnub.publish({
7171
// and this also works
7272

7373
pubnub.publish({'message' : c});
74+
75+
76+
// and this too
77+
78+
var d = PNmessage({
79+
'callback' : console.log,
80+
'error' : console.log,
81+
'channel' : 'push',
82+
'apns' : {'alert' : "this is alert", 'badge' : 2, 'key' : "hi am apns"},
83+
'gcm' : {"message":"be sure not to send objects!", "foo":"bar" },
84+
'mykey' : "hi"
85+
});
86+
87+
pubnub.publish({'message' : d});

‎node.js/pubnub.js‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -197,60 +197,57 @@ function ready() { timeout( function() {
197197
each( READY_BUFFER, function(connect) { connect() } );
198198
}, SECOND ); }
199199

200-
function PNmessage() {
201-
msg = {
202-
'apns' : {},
203-
'getPubnubMessage' : function() {
204-
var m = {};
205-
206-
if (Object.keys(msg['apns']).length) {
207-
m['pn_apns'] = {
208-
'aps' : {
209-
'alert' : msg['apns']['alert'],
210-
'badge' : msg['apns']['badge']
211-
}
212-
}
213-
for (var k in msg['apns']) {
214-
m['pn_apns'][k] = msg['apns'][k];
215-
}
216-
var exclude1 = ['badge','alert'];
217-
for (var k in exclude1) {
218-
//console.log(exclude[k]);
219-
delete m['pn_apns'][exclude1[k]];
220-
}
200+
function PNmessage(args) {
201+
msg = args || {'apns' : {}},
202+
msg['getPubnubMessage'] = function() {
203+
var m = {};
204+
205+
if (Object.keys(msg['apns']).length) {
206+
m['pn_apns'] = {
207+
'aps' : {
208+
'alert' : msg['apns']['alert'] ,
209+
'badge' : msg['apns']['badge']
210+
}
211+
}
212+
for (var k in msg['apns']) {
213+
m['pn_apns'][k] = msg['apns'][k];
221214
}
215+
var exclude1 = ['badge','alert'];
216+
for (var k in exclude1) {
217+
//console.log(exclude[k]);
218+
delete m['pn_apns'][exclude1[k]];
219+
}
220+
}
222221

223222

224223

225-
if (msg['gcm']) {
226-
m['pn_gcm'] = {
227-
'data' : msg['gcm']
228-
}
229-
}
224+
if (msg['gcm']) {
225+
m['pn_gcm'] = {
226+
'data' : msg['gcm']
227+
}
228+
}
230229

231-
for (var k in msg) {
232-
m[k] = msg[k];
233-
}
234-
var exclude = ['apns','gcm','send', 'channel','callback','error'];
235-
for (var k in exclude) {
236-
//console.log(exclude[k]);
237-
delete m[exclude[k]];
238-
}
230+
for (var k in msg) {
231+
m[k] = msg[k];
232+
}
233+
var exclude = ['apns','gcm','send', 'channel','callback','error'];
234+
for (var k in exclude) {
235+
delete m[exclude[k]];
236+
}
239237

240-
return m;
241-
},
242-
'send' : function() {
243-
244-
var m = msg.getPubnubMessage();
245-
246-
if (msg['pubnub'] && msg['channel']) {
247-
msg['pubnub'].publish({
248-
'message' : m,
249-
'channel' : msg['channel'],
250-
'callback' : msg['callback'],
251-
'error' : msg['error']
252-
})
253-
}
238+
return m;
239+
};
240+
msg['send'] = function() {
241+
242+
var m = msg.getPubnubMessage();
243+
244+
if (msg['pubnub'] && msg['channel']) {
245+
msg['pubnub'].publish({
246+
'message' : m,
247+
'channel' : msg['channel'],
248+
'callback' : msg['callback'],
249+
'error' : msg['error']
250+
})
254251
}
255252
};
256253
return msg;

0 commit comments

Comments
 (0)