Skip to content

Commit 7ecf056

Browse files
joychetryjoychetry
committed
v2.2.1
1. Fatal error after adding both Infinite Scroll Elementor and Button Load Elementor in the same page. 2. Fatal error after setting animation color to global color.
1 parent 4147ede commit 7ecf056

File tree

5 files changed

+73
-51
lines changed

5 files changed

+73
-51
lines changed

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
**Requires at least:** 5.0\
55
**Tested up to:** 5.5.1\
66
**Requires PHP:** 5.6\
7-
**Stable tag:** 2.2.0\
7+
**Stable tag:** 2.2.1\
88
**License:** GPLv3\
99
**License URI:** https://www.gnu.org/licenses/gpl-3.0.html
1010

@@ -47,6 +47,10 @@ For tutorial check [documentation](https://joychetry.com/infinite-scroll-element
4747

4848
## Changelog ##
4949

50+
### 2.2.1 - 2020-10-16 ###
51+
* Fix: Fatal error after adding both Infinite Scroll Elementor and Button Load Elementor in the same page ([#1](https://github.com/joychetry/infinite-scroll-elementor/issues/1)).
52+
* Fix: Fatal error after setting animation color to global color.
53+
5054
### 2.2.0 - 2020-09-26 ###
5155
* New: Button Load Elementor - ISE.
5256
* New: Style Tab.

‎includes/widgets/button-load-elementor-ise.php‎

Lines changed: 57 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected function register_layout_content_controls()
6464

6565
/* Pagination Type */
6666
$this->add_control(
67-
'ISE_register',
67+
'ISEButton_register',
6868
[
6969
'label' => __('Button Load', 'infinite-scroll-elementor-td'),
7070
'type' => \Elementor\Controls_Manager::SWITCHER,
@@ -84,14 +84,14 @@ protected function register_layout_content_controls()
8484
'default' => __('More Posts', 'infinite-scroll-elementor-td'),
8585
'placeholder' => __('More Posts', 'infinite-scroll-elementor-td'),
8686
'condition' => [
87-
'ISE_register' => 'yes',
87+
'ISEButton_register' => 'yes',
8888
],
8989
]
9090
);
9191

9292
/* Pagination For */
9393
$this->add_control(
94-
'pagination_for_setting',
94+
'button_pagination_for_setting',
9595
[
9696
'label' => __('Pagination For', 'infinite-scroll-elementor-td'),
9797
'type' => \Elementor\Controls_Manager::SELECT,
@@ -104,7 +104,7 @@ protected function register_layout_content_controls()
104104
'ise-custom-selectors' => __('Add Custom Selectors', 'infinite-scroll-elementor-td'),
105105
],
106106
'condition' => [
107-
'ISE_register' => 'yes',
107+
'ISEButton_register' => 'yes',
108108
]
109109
]
110110
);
@@ -118,7 +118,7 @@ protected function register_layout_content_controls()
118118
'label_on' => __('yes', 'infinite-scroll'),
119119
'label_off' => __('no', 'infinite-scroll'),
120120
'condition' => [
121-
'ISE_register' => 'yes',
121+
'ISEButton_register' => 'yes',
122122
],
123123
]
124124
);
@@ -134,7 +134,7 @@ protected function register_layout_content_controls()
134134
'text' => __('Text', 'infinite-scroll-elementor-td'),
135135
],
136136
'condition' => [
137-
'ISE_register' => 'yes',
137+
'ISEButton_register' => 'yes',
138138
'button_load_elementor_animation' => 'yes',
139139
],
140140
]
@@ -148,7 +148,7 @@ protected function register_layout_content_controls()
148148
'default' => __('Loading...', 'infinite-scroll-elementor-td'),
149149
'placeholder' => __('Loading...', 'infinite-scroll-elementor-td'),
150150
'condition' => [
151-
'ISE_register' => 'yes',
151+
'ISEButton_register' => 'yes',
152152
'button_load_elementor_animation' => 'yes',
153153
'button_load_elementor_loading_type' => 'text',
154154
],
@@ -163,7 +163,7 @@ protected function register_layout_content_controls()
163163
'default' => __('You have made it till the end!', 'infinite-scroll-elementor-td'),
164164
'placeholder' => __('You have made it till the end!', 'infinite-scroll-elementor-td'),
165165
'condition' => [
166-
'ISE_register' => 'yes',
166+
'ISEButton_register' => 'yes',
167167
'button_load_elementor_animation' => 'yes',
168168
],
169169
]
@@ -178,7 +178,7 @@ protected function register_layout_content_controls()
178178
'placeholder' => __('No post here!', 'infinite-scroll-elementor-td'),
179179
'separator' => 'after',
180180
'condition' => [
181-
'ISE_register' => 'yes',
181+
'ISEButton_register' => 'yes',
182182
'button_load_elementor_animation' => 'yes',
183183
],
184184
]
@@ -199,64 +199,64 @@ protected function register_layout_content_controls()
199199

200200
/* Custom Selectors */
201201
$this->start_controls_section(
202-
'custom_selectors_section',
202+
'custom_button_selectors_section',
203203
[
204204
'label' => __('Custom Selectors', 'infinite-scroll-elementor-td'),
205205
'condition' => [
206-
'pagination_for_setting' => 'ise-custom-selectors',
206+
'button_pagination_for_setting' => 'ise-custom-selectors',
207207
]
208208
]
209209
);
210210

211211
/* Navigation Selector */
212212
$this->add_control(
213-
'custom_selector_navigation_setting',
213+
'custom_button_selector_navigation_setting',
214214
[
215215
'label' => __('Navigation Selector', 'infinite-scroll-elementor-td'),
216216
'label_block' => true,
217217
'placeholder' => __('E.g. nav.navigation', 'infinite-scroll-elementor-td'),
218218
'type' => \Elementor\Controls_Manager::TEXT,
219219
'condition' => [
220-
'pagination_for_setting' => 'ise-custom-selectors',
220+
'button_pagination_for_setting' => 'ise-custom-selectors',
221221
]
222222
]
223223
);
224224

225225
$this->add_control(
226-
'custom_selector_next_setting',
226+
'custom_button_selector_next_setting',
227227
[
228228
'label' => __('Next Selector', 'infinite-scroll-elementor-td'),
229229
'label_block' => true,
230230
'placeholder' => __('E.g. a.next', 'infinite-scroll-elementor-td'),
231231
'type' => \Elementor\Controls_Manager::TEXT,
232232
'condition' => [
233-
'pagination_for_setting' => 'ise-custom-selectors',
233+
'button_pagination_for_setting' => 'ise-custom-selectors',
234234
]
235235
]
236236
);
237237

238238
$this->add_control(
239-
'custom_selector_content_setting',
239+
'custom_button_selector_content_setting',
240240
[
241241
'label' => __('Content Selector', 'infinite-scroll-elementor-td'),
242242
'label_block' => true,
243243
'placeholder' => __('E.g. div.items', 'infinite-scroll-elementor-td'),
244244
'type' => \Elementor\Controls_Manager::TEXT,
245245
'condition' => [
246-
'pagination_for_setting' => 'ise-custom-selectors',
246+
'button_pagination_for_setting' => 'ise-custom-selectors',
247247
]
248248
]
249249
);
250250

251251
$this->add_control(
252-
'custom_selector_item_setting',
252+
'custom_button_selector_item_setting',
253253
[
254254
'label' => __('Item Selector', 'infinite-scroll-elementor-td'),
255255
'label_block' => true,
256256
'placeholder' => __('E.g. div.item', 'infinite-scroll-elementor-td'),
257257
'type' => \Elementor\Controls_Manager::TEXT,
258258
'condition' => [
259-
'pagination_for_setting' => 'ise-custom-selectors',
259+
'button_pagination_for_setting' => 'ise-custom-selectors',
260260
]
261261
]
262262
);
@@ -273,7 +273,7 @@ protected function render()
273273

274274
$buttonText = $settings['button_load_elementor_button_text'];
275275

276-
function ISEcolor()
276+
function ISEButtoncolor()
277277
{
278278
?>
279279
<style>
@@ -329,22 +329,17 @@ function ISEcolor()
329329
animation-name: reveal;
330330
animation-direction: reverse;
331331
}
332-
333-
.view-more-button{
334-
color:#fff;
335-
padding:8px 16px;
336-
border-radius:3px;
337-
}
332+
338333
</style>
339334
<?php
340335
}
341336

342337

343338
// Elementor Posts
344-
if ($settings['pagination_for_setting'] == 'elementor-pro-posts') {
339+
if ($settings['button_pagination_for_setting'] == 'elementor-pro-posts') {
345340
if ($settings['button_load_elementor_loading_type'] == 'animation') {
346341
?>
347-
<?php ISEcolor() ?>
342+
<?php ISEButtoncolor() ?>
348343
<div class="page-load-status">
349344
<div class="loader-ellips infinite-scroll-request">
350345
<span class="loader-ellips__dot"></span>
@@ -357,7 +352,7 @@ function ISEcolor()
357352
</div>
358353
<?php
359354
} else { ?>
360-
<?php ISEcolor() ?>
355+
<?php ISEButtoncolor() ?>
361356
<div class="page-load-status">
362357
<p class="loadingText infinite-scroll-request"><?php echo $loadingText ?></p>
363358
<p class="infinite-scroll-last"><?php echo $lastText ?></p>
@@ -385,10 +380,10 @@ function ISEcolor()
385380

386381

387382
// Elementor Archive Posts
388-
if ($settings['pagination_for_setting'] == 'elementor-pro-archive-posts') {
383+
if ($settings['button_pagination_for_setting'] == 'elementor-pro-archive-posts') {
389384
if ($settings['button_load_elementor_loading_type'] == 'animation') {
390385
?>
391-
<?php ISEcolor() ?>
386+
<?php ISEButtoncolor() ?>
392387
<div class="page-load-status">
393388
<div class="loader-ellips infinite-scroll-request">
394389
<span class="loader-ellips__dot"></span>
@@ -401,7 +396,7 @@ function ISEcolor()
401396
</div>
402397
<?php
403398
} else { ?>
404-
<?php ISEcolor() ?>
399+
<?php ISEButtoncolor() ?>
405400
<div class="page-load-status">
406401
<p class="loadingText infinite-scroll-request"><?php echo $loadingText ?></p>
407402
<p class="infinite-scroll-last"><?php echo $lastText ?></p>
@@ -428,10 +423,10 @@ function ISEcolor()
428423
}
429424

430425
// Elementor Products
431-
elseif ($settings['pagination_for_setting'] == 'elementor-pro-products') {
426+
elseif ($settings['button_pagination_for_setting'] == 'elementor-pro-products') {
432427
if ($settings['button_load_elementor_loading_type'] == 'animation') {
433428
?>
434-
<?php ISEcolor() ?>
429+
<?php ISEButtoncolor() ?>
435430
<div class="page-load-status">
436431
<div class="loader-ellips infinite-scroll-request">
437432
<span class="loader-ellips__dot"></span>
@@ -444,7 +439,7 @@ function ISEcolor()
444439
</div>
445440
<?php
446441
} else { ?>
447-
<?php ISEcolor() ?>
442+
<?php ISEButtoncolor() ?>
448443
<div class="page-load-status">
449444
<p class="loadingText infinite-scroll-request"><?php echo $loadingText ?></p>
450445
<p class="infinite-scroll-last"><?php echo $lastText ?></p>
@@ -471,15 +466,15 @@ function ISEcolor()
471466
}
472467

473468
// Custom selectors
474-
elseif ($settings['pagination_for_setting'] == 'ise-custom-selectors') {
475-
$hideNav_custom = $settings['custom_selector_navigation_setting'];
476-
$path_custom = $settings['custom_selector_next_setting'];
477-
$content_custom = $settings['custom_selector_content_setting'];
478-
$append_custom = $settings['custom_selector_item_setting'];
469+
elseif ($settings['button_pagination_for_setting'] == 'ise-custom-selectors') {
470+
$hideNav_custom = $settings['custom_button_selector_navigation_setting'];
471+
$path_custom = $settings['custom_button_selector_next_setting'];
472+
$content_custom = $settings['custom_button_selector_content_setting'];
473+
$append_custom = $settings['custom_button_selector_item_setting'];
479474

480475
if ($settings['button_load_elementor_loading_type'] == 'animation') {
481476
?>
482-
<?php ISEcolor() ?>
477+
<?php ISEButtoncolor() ?>
483478
<div class="page-load-status">
484479
<div class="loader-ellips infinite-scroll-request">
485480
<span class="loader-ellips__dot"></span>
@@ -492,7 +487,7 @@ function ISEcolor()
492487
</div>
493488
<?php
494489
} else { ?>
495-
<?php ISEcolor() ?>
490+
<?php ISEButtoncolor() ?>
496491
<div class="page-load-status">
497492
<p class="loadingText infinite-scroll-request"><?php echo $loadingText ?></p>
498493
<p class="infinite-scroll-last"><?php echo $lastText ?></p>
@@ -659,6 +654,10 @@ public function register_button_load_style_controls()
659654
[
660655
'label' => __('Color', 'infinite-scroll-elementor-td'),
661656
'type' => Controls_Manager::COLOR,
657+
'scheme' => [
658+
'type' => \Elementor\Scheme_Color::get_type(),
659+
'value' => \Elementor\Scheme_Color::COLOR_1,
660+
],
662661
'selectors' => [
663662
'{{WRAPPER}} .view-more-button' => 'color: {{VALUE}};',
664663
],
@@ -670,6 +669,10 @@ public function register_button_load_style_controls()
670669
[
671670
'label' => __('Background Color', 'infinite-scroll-elementor-td'),
672671
'type' => Controls_Manager::COLOR,
672+
'scheme' => [
673+
'type' => \Elementor\Scheme_Color::get_type(),
674+
'value' => \Elementor\Scheme_Color::COLOR_1,
675+
],
673676
'selectors' => [
674677
'{{WRAPPER}} .view-more-button' => 'background-color: {{VALUE}};',
675678
],
@@ -687,6 +690,10 @@ public function register_button_load_style_controls()
687690
[
688691
'label' => __('Color', 'infinite-scroll-elementor-td'),
689692
'type' => Controls_Manager::COLOR,
693+
'scheme' => [
694+
'type' => \Elementor\Scheme_Color::get_type(),
695+
'value' => \Elementor\Scheme_Color::COLOR_1,
696+
],
690697
'selectors' => [
691698
'{{WRAPPER}} .view-more-button:hover' => 'color: {{VALUE}};',
692699
],
@@ -698,6 +705,10 @@ public function register_button_load_style_controls()
698705
[
699706
'label' => __('Background Color', 'infinite-scroll-elementor-td'),
700707
'type' => Controls_Manager::COLOR,
708+
'scheme' => [
709+
'type' => \Elementor\Scheme_Color::get_type(),
710+
'value' => \Elementor\Scheme_Color::COLOR_1,
711+
],
701712
'selectors' => [
702713
'{{WRAPPER}} .view-more-button:hover' => 'background-color: {{VALUE}};',
703714
],
@@ -793,6 +804,10 @@ public function register_button_animation_style_controls()
793804
[
794805
'label' => __('Animation Color', 'infinite-scroll-elementor-td'),
795806
'type' => Controls_Manager::COLOR,
807+
'scheme' => [
808+
'type' => \Elementor\Scheme_Color::get_type(),
809+
'value' => \Elementor\Scheme_Color::COLOR_1,
810+
],
796811
'default' => '#a1a1a1',
797812
'selectors' => [
798813
'{{WRAPPER}} .loader-ellips__dot' => 'background: {{VALUE}};',

‎includes/widgets/infinite-scroll-elementor-ise.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,7 @@ function ISEcolor()
311311
animation-name: reveal;
312312
animation-direction: reverse;
313313
}
314-
315-
.view-more-button{
316-
color:#fff;
317-
padding:8px 16px;
318-
border-radius:3px;
319-
}
314+
320315
</style>
321316
<?php
322317
}
@@ -592,6 +587,10 @@ public function register_infinite_scroll_animation_style_controls()
592587
[
593588
'label' => __('Animation Color', 'infinite-scroll-elementor-td'),
594589
'type' => Controls_Manager::COLOR,
590+
'scheme' => [
591+
'type' => \Elementor\Scheme_Color::get_type(),
592+
'value' => \Elementor\Scheme_Color::COLOR_1,
593+
],
595594
'default' => '#a1a1a1',
596595
'selectors' => [
597596
'{{WRAPPER}} .loader-ellips__dot' => 'background: {{VALUE}};',

‎infinite-scroll-elementor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Description: Infinite Scroll Elementor pulls the next posts automatically when the reader approaches the bottom of the page.
55
* Tags: infinite scroll, load more, pagination, paginate, scroll, infinite, infinity, ajax, posts, products, elementor, woocommerce, facetwp, jetsmartfilters
66
* Plugin URI: https://joychetry.com/infinite-scroll-elementor/
7-
* Version: 2.2.0
7+
* Version: 2.2.1
88
* Author: Joy Chetry
99
* Author URI: https://joychetry.com/
1010
* Text Domain: infinite-scroll-elementor
@@ -16,7 +16,7 @@
1616

1717
final class infinite_scroll_elementor_Final
1818
{
19-
const VERSION = '2.2.0';
19+
const VERSION = '2.2.1';
2020
const MINIMUM_ELEMENTOR_VERSION = '2.0.0';
2121
const MINIMUM_PHP_VERSION = '5.6';
2222

0 commit comments

Comments
 (0)