Cherry Services List - Version 1.4.5

Version Description

Download this release

Release Info

Developer TemplateMonster 2002
Plugin Icon 128x128 Cherry Services List
Version 1.4.5
Comparing to
See all releases

Code changes from version 1.4.4 to 1.4.5

Files changed (4) hide show
  1. cherry-services-list.php +2 -2
  2. public/assets/js/cherry-services.js +9 -7
  3. public/includes/class-cherry-services-list-data.php +7 -22
  4. readme.txt +3 -3
cherry-services-list.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Cherry Services List
4
  * Plugin URI:
5
  * Description: Cherry Services is a flexible WordPress plugin that lets you display your company’s services in a variety of ways.
6
- * Version: 1.4.4
7
  * Author: JetImpex
8
  * Author URI: https://jetimpex.com/wordpress/
9
  * Text Domain: cherry-services
@@ -92,7 +92,7 @@ if ( ! class_exists( 'Cherry_Services_List' ) ) {
92
  * @access private
93
  * @var string
94
  */
95
- private $version = '1.4.4';
96
 
97
  /**
98
  * Plugin CPT name
3
  * Plugin Name: Cherry Services List
4
  * Plugin URI:
5
  * Description: Cherry Services is a flexible WordPress plugin that lets you display your company’s services in a variety of ways.
6
+ * Version: 1.4.5
7
  * Author: JetImpex
8
  * Author URI: https://jetimpex.com/wordpress/
9
  * Text Domain: cherry-services
92
  * @access private
93
  * @var string
94
  */
95
+ private $version = '1.4.5';
96
 
97
  /**
98
  * Plugin CPT name
public/assets/js/cherry-services.js CHANGED
@@ -47,13 +47,15 @@
47
 
48
  render: function ( self ) {
49
 
50
- $( self.settings.selectors.main ).each( function() {
51
- self.initFilters( $( this ) );
52
- self.initLoadMore( $( this ) );
53
- self.initPager( $( this ) );
54
- } );
55
-
56
- $( window ).on( 'elementor/frontend/init', self.initElementorWidget );
 
 
57
 
58
  },
59
 
47
 
48
  render: function ( self ) {
49
 
50
+ if ( window.elementorFrontend ) {
51
+ $( self.settings.selectors.main ).each( function() {
52
+ self.initFilters( $( this ) );
53
+ self.initLoadMore( $( this ) );
54
+ self.initPager( $( this ) );
55
+ } );
56
+ } else {
57
+ $( window ).on( 'elementor/frontend/init', self.initElementorWidget );
58
+ }
59
 
60
  },
61
 
public/includes/class-cherry-services-list-data.php CHANGED
@@ -153,11 +153,9 @@ class Cherry_Services_List_Data {
153
  // The Query.
154
  $query = $this->get_services( $args );
155
 
156
- global $wp_query;
157
-
158
- $this->temp_query = $wp_query;
159
- $wp_query = null;
160
- $wp_query = $query;
161
 
162
  // Fix boolean.
163
  if ( isset( $args['pager'] ) && ( ( 'true' == $args['pager'] ) || true === $args['pager'] ) ) {
@@ -168,13 +166,6 @@ class Cherry_Services_List_Data {
168
 
169
  $args['more'] = filter_var( $args['more'], FILTER_VALIDATE_BOOLEAN );
170
 
171
- // The Display.
172
- if ( ! $query || is_wp_error( $query ) ) {
173
- $wp_query = null;
174
- $wp_query = $this->temp_query;
175
- return;
176
- }
177
-
178
  $css_classes = array( 'cherry-services' );
179
 
180
  if ( ! empty( $args['wrap_class'] ) ) {
@@ -229,14 +220,11 @@ class Cherry_Services_List_Data {
229
  $output .= '</div>';
230
 
231
  if ( true == $args['more'] ) {
232
- $output .= $this->get_more_button( $args );
233
  } elseif ( true === $args['pager'] ) {
234
- $output .= $this->get_pagination();
235
  }
236
 
237
- $wp_query = null;
238
- $wp_query = $this->temp_query;
239
-
240
  /**
241
  * Filters HTML-formatted services before display or return.
242
  *
@@ -247,9 +235,6 @@ class Cherry_Services_List_Data {
247
  */
248
  $output = apply_filters( 'cherry_services_html', $output, $query, $args );
249
 
250
- wp_reset_query();
251
- wp_reset_postdata();
252
-
253
  if ( true != $args['echo'] ) {
254
  return $output;
255
  }
@@ -536,7 +521,7 @@ class Cherry_Services_List_Data {
536
  */
537
  public function get_services_loop( $query, $args ) {
538
 
539
- global $post, $more;
540
 
541
  // Item template.
542
  $template = cherry_services_templater()->get_template_by_name( $args['template'] );
@@ -570,7 +555,7 @@ class Cherry_Services_List_Data {
570
 
571
  $this->replace_args['link'] = $link;
572
 
573
- cherry_services_templater()->set_parent_query( $this->temp_query );
574
  $tpl = cherry_services_templater()->parse_template( $tpl );
575
 
576
  $item_classes = array( $args['item_class'], 'item-' . $count, 'clearfix' );
153
  // The Query.
154
  $query = $this->get_services( $args );
155
 
156
+ if ( ! $query || is_wp_error( $query ) ) {
157
+ return;
158
+ }
 
 
159
 
160
  // Fix boolean.
161
  if ( isset( $args['pager'] ) && ( ( 'true' == $args['pager'] ) || true === $args['pager'] ) ) {
166
 
167
  $args['more'] = filter_var( $args['more'], FILTER_VALIDATE_BOOLEAN );
168
 
 
 
 
 
 
 
 
169
  $css_classes = array( 'cherry-services' );
170
 
171
  if ( ! empty( $args['wrap_class'] ) ) {
220
  $output .= '</div>';
221
 
222
  if ( true == $args['more'] ) {
223
+ $output .= $this->get_more_button( $args, $query );
224
  } elseif ( true === $args['pager'] ) {
225
+ $output .= $this->get_pagination( $query );
226
  }
227
 
 
 
 
228
  /**
229
  * Filters HTML-formatted services before display or return.
230
  *
235
  */
236
  $output = apply_filters( 'cherry_services_html', $output, $query, $args );
237
 
 
 
 
238
  if ( true != $args['echo'] ) {
239
  return $output;
240
  }
521
  */
522
  public function get_services_loop( $query, $args ) {
523
 
524
+ global $post, $wp_query;
525
 
526
  // Item template.
527
  $template = cherry_services_templater()->get_template_by_name( $args['template'] );
555
 
556
  $this->replace_args['link'] = $link;
557
 
558
+ cherry_services_templater()->set_parent_query( $wp_query );
559
  $tpl = cherry_services_templater()->parse_template( $tpl );
560
 
561
  $item_classes = array( $args['item_class'], 'item-' . $count, 'clearfix' );
readme.txt CHANGED
@@ -1,10 +1,10 @@
1
- === Cherry Services List ===
2
 
3
  Contributors: TemplateMonster 2002
4
  Tags: custom post type, services, service, cherry-framework, elementor, elementor builder
5
  Requires at least: 4.7
6
- Tested up to: 4.8.1
7
- Stable tag: 1.4.4
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
1
+ === Cherry Services List ===
2
 
3
  Contributors: TemplateMonster 2002
4
  Tags: custom post type, services, service, cherry-framework, elementor, elementor builder
5
  Requires at least: 4.7
6
+ Tested up to: 4.8.2
7
+ Stable tag: 1.4.5
8
  License: GPLv3 or later
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10