Skip to content

Commit 470d871

Browse files
KartikTalwarKartikTalwar
committed
Converted observe callback dict to function params
1 parent f84f36b commit 470d871

File tree

1 file changed

+54
-29
lines changed

1 file changed

+54
-29
lines changed

‎gmail.js‎

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -465,141 +465,166 @@ var Gmail = function() {
465465

466466
switch(action) {
467467
case "ur" :
468-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
468+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
469+
var response = [email_ids, params.url, params.body];
469470
console.log('You just marked something as unread');
470471
break;
471472

472473
case "rd":
473-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
474+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
475+
var response = [email_ids, params.url, params.body];
474476
console.log('You just marked something as read');
475477
break;
476478

477479
case "tr":
478-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
480+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
481+
var response = [email_ids, params.url, params.body];
479482
console.log('You just deleted something');
480483
break;
481484

482485
case "sp":
483-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
486+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
487+
var response = [email_ids, params.url, params.body];
484488
console.log('You just marked something as spam');
485489
break;
486490

487491
case "us":
488-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
492+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
493+
var response = [email_ids, params.url, params.body];
489494
console.log('You just marked something as not spam');
490495
break;
491496

492497
case "arl":
493-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body, "label" : params.url.acn}
498+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body, "label" : params.url.acn}
499+
var response = [email_ids, params.url, params.body, params.url.acn];
494500
console.log('You just marked created a label');
495501
break;
496502

497503
case "ib":
498-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
504+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
505+
var response = [email_ids, params.url, params.body];
499506
console.log('You just moved something to inbox');
500507
break;
501508

502509
case "dl":
503-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
510+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
511+
var response = [email_ids, params.url, params.body];
504512
console.log('You just permanently deleted something');
505513
break;
506514

507515
case "st":
508-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
516+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
517+
var response = [email_ids, params.url, params.body];
509518
console.log('You just permanently starred something');
510519
break;
511520

512521
case "xst":
513-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
522+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
523+
var response = [email_ids, params.url, params.body];
514524
console.log('You just permanently unstarred something');
515525
break;
516526

517527
case "mai":
518-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
528+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
529+
var response = [email_ids, params.url, params.body];
519530
console.log('You just marked something as important');
520531
break;
521532

522533
case "mani":
523-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
534+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
535+
var response = [email_ids, params.url, params.body];
524536
console.log('You just marked something as not important');
525537
break;
526538

527539
case "ig":
528-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
540+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
541+
var response = [email_ids, params.url, params.body];
529542
console.log('You just muted a conversation');
530543
break;
531544

532545
case "ug":
533-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
546+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
547+
var response = [email_ids, params.url, params.body];
534548
console.log('You just unmuted a conversation');
535549
break;
536550

537551
case "sd":
538-
var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
552+
// var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
553+
var response = [email_ids, params.url, sent_params];
539554
console.log('You just saved a draft');
540555
break;
541556

542557
case "dd":
543-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
558+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
559+
var response = [email_ids, params.url, params.body];
544560
console.log('You just deleted a draft');
545561
break;
546562

547563
case "mt":
548-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
564+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
565+
var response = [email_ids, params.url, params.body];
549566
console.log('You just moved conversation to label');
550567
break;
551568

552569
case "tae":
553-
var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
570+
// var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
571+
var response = [params.url, params.body, sent_params];
554572
console.log('You just added a task');
555573
break;
556574

557575
case "cffm":
558-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
576+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
577+
var response = [email_ids, params.url, params.body];
559578
console.log('You just chose to filter a message');
560579
break;
561580

562581
case "rc_^i":
563-
var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
582+
// var response = {"id" : email_ids, "url" : params.url, "body" : params.body}
583+
var response = [email_ids, params.url, params.body];
564584
console.log('You just archived something');
565585
break;
566586

567587
case "sm":
568-
var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
588+
// var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
589+
var response = [params.url, params.body, sent_params];
569590
console.log('You just sent a message');
570591
break;
571592

572593
case "el":
573-
var response = {"url" : params.url, "body" : params.body, "data" : sent_params.ex == '1'}
594+
// var response = {"url" : params.url, "body" : params.body, "data" : sent_params.ex == '1'}
595+
var response = [params.url, params.body, sent_params.ex == '1'];
574596
console.log('You just expanded a category');
575597
break;
576598
}
577599

578600
if(typeof params.url._reqid == 'string' && typeof params.url.th == 'string') {
579-
var response = {"id" : params.url.th, "url" : params.url, "body" : params.body}
601+
// var response = {"id" : params.url.th, "url" : params.url, "body" : params.body}
602+
var response = [params.url.th, params.url, params.body];
580603
if('new_email' in api.tracker.watchdog) {
581-
api.tracker.watchdog['new_email'](response);
604+
api.tracker.watchdog['new_email'].apply(undefined, response);
582605
}
583606
}
584607

585608
if(typeof params.url.SID == 'string' && typeof params.url.zx == 'string' && params.body.indexOf('req0_') != -1) {
586609
api.tracker.SID = params.url.SID;
587-
var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
610+
// var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
611+
var response = [params.url, params.body, sent_params];
588612
if('poll' in api.tracker.watchdog) {
589-
api.tracker.watchdog['poll'](response);
613+
api.tracker.watchdog['poll'].apply(undefined, response);
590614
}
591615
}
592616

593617
if(typeof params.url.ik == 'string' && typeof params.url.search == 'string' && params.body.length == 0 && typeof params.url._reqid == 'string') {
594-
var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
618+
// var response = {"url" : params.url, "body" : params.body, "data" : sent_params}
619+
var response = [params.url, params.body, sent_params];
595620
if('refresh' in api.tracker.watchdog) {
596-
api.tracker.watchdog['refresh'](response);
621+
api.tracker.watchdog['refresh'].apply(undefined, response);
597622
}
598623
}
599624

600625
if(response != null) {
601626
if(action in api.tracker.watchdog) {
602-
api.tracker.watchdog[action](response);
627+
api.tracker.watchdog[action].apply(undefined, response);
603628
}
604629
}
605630

0 commit comments

Comments
 (0)