| @@ -218,9 +218,8 @@ | ||
| 218 | 218 | WPUltimatePostGrid.changedOrderBy(); |
| 219 | 219 | WPUltimatePostGrid.changedLimitPosts(); |
| 220 | 220 | WPUltimatePostGrid.initRules(); |
| 221 | 221 | WPUltimatePostGrid.changedFilterType(); |
| 222 | - WPUltimatePostGrid.changedShowCount(); | |
| 223 | 222 | WPUltimatePostGrid.changedMultiselect(); |
| 224 | 223 | WPUltimatePostGrid.changedLimitTerms(); |
| 225 | 224 | WPUltimatePostGrid.changedDropdownLabels(); |
| 226 | 225 | WPUltimatePostGrid.changedIsotopeFilterStyle(); |
| @@ -240,9 +239,8 @@ | ||
| 240 | 239 | jQuery('.wpupg_rule_field').on('change', function(e) { WPUltimatePostGrid.changedRuleField(jQuery(this).parents('tr').attr('data-rule')); }); |
| 241 | 240 | jQuery('.rule_container_wpupg_general_date').find('select').on('change', function(e) { WPUltimatePostGrid.changedDateRule(jQuery(this).parents('tr').attr('data-rule')); }); |
| 242 | 241 | jQuery('.wpupg-date').on('change', function(e) { WPUltimatePostGrid.changedDateRule(jQuery(this).parents('tr').attr('data-rule')); }); |
| 243 | 242 | jQuery('#wpupg_filter_type').on('change', function() { WPUltimatePostGrid.changedFilterType(); }); |
| 244 | - jQuery('#wpupg_filter_count').on('change', function() { WPUltimatePostGrid.changedShowCount(); }); | |
| 245 | 243 | jQuery('#wpupg_filter_multiselect').on('change', function() { WPUltimatePostGrid.changedMultiselect(); }); |
| 246 | 244 | jQuery('.wpupg_filter_taxonomy').on('change', function() { WPUltimatePostGrid.changedLimitTerms(); WPUltimatePostGrid.changedDropdownLabels(); }); |
| 247 | 245 | jQuery('#wpupg_filter_limit').on('change', function() { WPUltimatePostGrid.changedLimitTerms(); }); |
| 248 | 246 | jQuery('#wpupg_layout_mode').on('change', function() { WPUltimatePostGrid.changedLayoutMode(); }); |
| @@ -468,14 +466,10 @@ | ||
| 468 | 466 | |
| 469 | 467 | WPUltimatePostGrid.changedFilterType = function() { |
| 470 | 468 | var filter_type = jQuery('#wpupg_filter_type').find(':selected').val(); |
| 471 | 469 | |
| 472 | - if(filter_type.substring(0,5) == 'text_') { | |
| 473 | - filter_type = filter_type.substring(5); | |
| 474 | - } | |
| 475 | - | |
| 476 | 470 | // Hide & Show Filter Settings |
| 477 | - if(filter_type == 'none' || filter_type == 'text') { | |
| 471 | + if(filter_type == 'none') { | |
| 478 | 472 | jQuery('#wpupg_form_filter').find('tr').not('.wpupg_no_filter').hide(); |
| 479 | 473 | } else { |
| 480 | 474 | jQuery('#wpupg_form_filter').find('tr').not('.wpupg_no_filter').show(); |
| 481 | 475 | } |
| @@ -480,9 +474,9 @@ | ||
| 480 | 474 | jQuery('#wpupg_form_filter').find('tr').not('.wpupg_no_filter').show(); |
| 481 | 475 | } |
| 482 | 476 | |
| 483 | 477 | // Premium only filters |
| 484 | - if(filter_type == 'dropdown' || filter_type == 'text') { | |
| 478 | + if(filter_type == 'dropdown') { | |
| 485 | 479 | WPUltimatePostGrid.checkPremiumFeatures('filter_type', true); |
| 486 | 480 | } else { |
| 487 | 481 | WPUltimatePostGrid.checkPremiumFeatures('filter_type', false); |
| 488 | 482 | } |
| @@ -498,18 +492,8 @@ | ||
| 498 | 492 | WPUltimatePostGrid.changedLimitTerms(); |
| 499 | 493 | WPUltimatePostGrid.changedDropdownLabels(); |
| 500 | 494 | }; |
| 501 | 495 | |
| 502 | -WPUltimatePostGrid.changedShowCount = function() { | |
| 503 | - var show_count = jQuery('#wpupg_filter_count').is(':checked'); | |
| 504 | - | |
| 505 | - if(show_count) { | |
| 506 | - WPUltimatePostGrid.checkPremiumFeatures('show_count', true); | |
| 507 | - } else { | |
| 508 | - WPUltimatePostGrid.checkPremiumFeatures('show_count', false); | |
| 509 | - } | |
| 510 | -}; | |
| 511 | - | |
| 512 | 496 | WPUltimatePostGrid.changedMultiselect = function() { |
| 513 | 497 | var multiselect = jQuery('#wpupg_filter_multiselect').is(':checked'); |
| 514 | 498 | |
| 515 | 499 | if(multiselect) { |
| @@ -545,12 +529,8 @@ | ||
| 545 | 529 | WPUltimatePostGrid.changedDropdownLabels = function() { |
| 546 | 530 | var filter_type = jQuery('#wpupg_filter_type').find(':selected').val(); |
| 547 | 531 | var post_type = jQuery('#wpupg_post_types').find(':selected').val(); |
| 548 | 532 | var taxonomies = jQuery('#wpupg_filter_taxonomy_' + post_type).val(); |
| 549 | - | |
| 550 | - if(filter_type.substring(0,5) == 'text_') { | |
| 551 | - filter_type = filter_type.substring(5); | |
| 552 | - } | |
| 553 | 533 | |
| 554 | 534 | if( !jQuery.isArray( taxonomies ) ) { |
| 555 | 535 | taxonomies = [taxonomies]; |
| 556 | 536 | } |