|
495 | 495 | trackName = $(this).text();
|
496 | 496 | trackFilterMode = 1;
|
497 | 497 | roomFilterMode=0;
|
| 498 | + var local_storage_events=JSON.parse(localStorage[eventName]); |
498 | 499 |
|
499 | 500 | var sidebarDiv = $('.side-collapse');
|
500 | 501 | if (!sidebarDiv.hasClass('in'))
|
|
521 | 522 | $(this).find('.event').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 ||
|
522 | 523 | $(this).find('.speaker-name').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0) {
|
523 | 524 | var name=$(this).find('.title-inline .blacktext').text();
|
524 |
| - if(name!=trackName) { |
| 525 | + var id=$(this).attr('id'); |
| 526 | + if(mode && local_storage_events[id]!=1) |
| 527 | + { |
| 528 | + $(this).hide(); |
| 529 | + }else if(name!=trackName) { |
525 | 530 | $(this).hide();
|
526 | 531 | } else {
|
527 | 532 | $(this).show();
|
|
558 | 563 | roomName = $(this).text();
|
559 | 564 | roomFilterMode = 1;
|
560 | 565 | trackFilterMode = 0;
|
| 566 | + var local_storage_events = JSON.parse(localStorage[eventName]); |
561 | 567 |
|
562 | 568 | var sidebarDiv = $('.side-collapse');
|
563 | 569 | if (!sidebarDiv.hasClass('in'))
|
|
584 | 590 | $(this).find('.event').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 ||
|
585 | 591 | $(this).find('.speaker-name').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0) {
|
586 | 592 | var name = $(this).find('#location').text();
|
587 |
| - if (name != roomName) { |
| 593 | + var id=$(this).attr('id'); |
| 594 | + if(mode && local_storage_events[id]!=1) { |
| 595 | + $(this).hide(); |
| 596 | + } else if (name != roomName) { |
588 | 597 | $(this).hide();
|
589 | 598 | } else {
|
590 | 599 | $(this).show();
|
|
611 | 620 | });
|
612 | 621 |
|
613 | 622 | $('.fossasia-filter').change(function() {
|
| 623 | +
|
614 | 624 | var filterVal = $(this).val();
|
| 625 | + var local_storage_events = JSON.parse(localStorage[eventName]); |
| 626 | +
|
615 | 627 | $('.day-filter').each(function() {
|
616 | 628 | var temp = 1;
|
617 | 629 | $(this).find('.time-filter').each(function() {
|
618 | 630 | var flag = 1;
|
619 | 631 | $(this).find('.schedule-track').each(function() {
|
| 632 | + var id=$(this).attr('id'); |
620 | 633 | if ($(this).find('.tip-description').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 ||
|
621 | 634 | $(this).find('.session-speakers-list a p span').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 ||
|
622 | 635 | $(this).find('.session-speakers-more').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 ||
|
623 | 636 | $(this).find('.event').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 ||
|
624 | 637 | $(this).find('.speaker-name').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0) {
|
625 | 638 | var trackVal=$(this).find('.title-inline .blacktext').text();
|
626 | 639 | var roomVal=$(this).find('#location').text();
|
627 |
| - if(trackFilterMode && trackVal!=trackName) { |
| 640 | + if(mode && local_storage_events[id]!=1){ |
| 641 | + $(this).hide(); |
| 642 | + }else if(trackFilterMode && trackVal!=trackName) { |
628 | 643 | $(this).hide();
|
629 | 644 | }else if(roomFilterMode&&roomVal!=roomName){
|
630 | 645 | $(this).hide();
|
|
825 | 840 |
|
826 | 841 | function display() {
|
827 | 842 | var temp = JSON.parse(localStorage[eventName]);
|
| 843 | + var filterVal; |
| 844 | + $('.fossasia-filter').each(function () { |
| 845 | + if ($(this).is(':visible')) { |
| 846 | + filterVal = $(this).val(); |
| 847 | + } |
| 848 | + }); |
828 | 849 |
|
829 | 850 | $('.day-filter').each(function() {
|
830 | 851 | var dayFlag = 0;
|
831 | 852 | $(this).find('.time-filter').each(function() {
|
832 | 853 | var timeFlag = 0;
|
833 | 854 | $(this).find('.schedule-track').each(function() {
|
| 855 | + var filter=1; |
| 856 | + if(trackFilterMode){ |
| 857 | + var trackVal=$(this).find('.title-inline .blacktext').text(); |
| 858 | + if(trackVal!=trackName){ |
| 859 | + filter=0; |
| 860 | + } |
| 861 | + } else if(roomFilterMode){ |
| 862 | + var roomVal=$(this).find('#location').text(); |
| 863 | + if(roomVal!=roomName){ |
| 864 | + filter=0; |
| 865 | + } |
| 866 | + } |
834 | 867 | var elemId = $(this).attr('id');
|
835 | 868 | var elemFlag = 0;
|
836 |
| - if(temp[elemId] == 1) { |
837 |
| - elemFlag = timeFlag = dayFlag = 1; |
838 |
| - $(this).find('.bookmark').each(function() { |
839 |
| - $(this).css("color", "black"); |
840 |
| - }); |
| 869 | + if ($(this).find('.tip-description').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 || |
| 870 | + $(this).find('.session-speakers-list a p span').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 || |
| 871 | + $(this).find('.session-speakers-more').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 || |
| 872 | + $(this).find('.event').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0 || |
| 873 | + $(this).find('.speaker-name').text().toUpperCase().indexOf(filterVal.toUpperCase()) >= 0){ |
| 874 | + if(temp[elemId] == 1 && filter) { |
| 875 | + elemFlag = 1; |
| 876 | + $(this).find('.bookmark').each(function() { |
| 877 | + $(this).css("color", "black"); |
| 878 | + }); |
| 879 | + }else if(!mode&&filter) { |
| 880 | + elemFlag=1; |
| 881 | + } |
841 | 882 | }
|
842 |
| - if (elemFlag || !mode) { |
| 883 | + if (elemFlag) { |
| 884 | + timeFlag=1; |
843 | 885 | $(this).show();
|
844 | 886 | }
|
845 | 887 | else {
|
846 | 888 | $(this).hide();
|
847 | 889 | }
|
848 | 890 | });
|
849 | 891 |
|
850 |
| - if(timeFlag || !mode) { |
| 892 | + if(timeFlag) { |
| 893 | + dayFlag=1; |
851 | 894 | $(this).show();
|
852 | 895 | }
|
853 | 896 | else {
|
854 | 897 | $(this).hide();
|
855 | 898 | }
|
856 | 899 | });
|
857 | 900 |
|
858 |
| - if(dayFlag || !mode) { |
| 901 | + if(dayFlag) { |
859 | 902 | $(this).show();
|
860 | 903 | }
|
861 | 904 | else {
|
|
0 commit comments