Skip to content

Commit d1b88b1

Browse files
lushkantlushkant
authored
Merge pull request #675 from analogwp/release-v2.2.1
Release v2.2.1
2 parents 88388eb + 464bd57 commit d1b88b1

File tree

11 files changed

+185
-466
lines changed

11 files changed

+185
-466
lines changed

‎.travis.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,21 @@ dist: trusty
33
sudo: false
44

55
php:
6-
- "5.6"
7-
- "7.0"
8-
- "7.2"
9-
- "7.3"
106
- "7.4"
7+
- "8.0"
8+
- "8.1"
119

1210
env:
1311
- WP_VERSION=latest WP_MULTISITE=0
14-
- WP_VERSION=5.1 WP_MULTISITE=0
15-
- WP_VERSION=5.0 WP_MULTISITE=0
12+
- WP_VERSION=6.6 WP_MULTISITE=0
1613

1714
matrix:
1815
include:
19-
- php: "7.4"
20-
env: WP_VERSION=latest WP_MULTISITE=0
21-
- php: "7.3"
16+
- php: "8.1"
2217
env: WP_VERSION=latest WP_MULTISITE=0
23-
- php: "7.1"
18+
- php: "8.0"
2419
env: WP_VERSION=latest WP_MULTISITE=0
25-
- php: "7.1"
26-
env: WP_VERSION=5.0 WP_MULTISITE=0
27-
- php: "5.6"
20+
- php: "7.4"
2821
env: WP_VERSION=latest WP_MULTISITE=0
2922

3023
branches:

‎analogwp-templates.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010
* Plugin Name: Style Kits for Elementor
1111
* Plugin URI: https://analogwp.com/
1212
* Description: Style Kits extends the Elementor theme styles editor with more global styling options. Boost your design workflow in Elementor with intuitive global controls and theme style presets.
13-
* Version: 2.2.0
13+
* Version: 2.2.1
1414
* Author: AnalogWP
1515
* Author URI: https://analogwp.com/
1616
* License: GPL2
1717
* License URI: https://www.gnu.org/licenses/gpl-2.0.html
1818
* Text Domain: ang
19-
* Elementor tested up to: 3.25.7
20-
* Elementor Pro tested up to: 3.25.3
19+
* Elementor tested up to: 3.25.10
20+
* Elementor Pro tested up to: 3.25.4
2121
*/
2222

2323
defined( 'ABSPATH' ) || exit;
2424

25-
define( 'ANG_ELEMENTOR_MINIMUM', '3.10.0' );
25+
define( 'ANG_ELEMENTOR_MINIMUM', '3.20.0' );
2626
define( 'ANG_PHP_MINIMUM', '8.0' );
2727
define( 'ANG_WP_MINIMUM', '6.0' );
28-
define( 'ANG_VERSION', '2.2.0' );
28+
define( 'ANG_VERSION', '2.2.1' );
2929
define( 'ANG_PLUGIN_FILE', __FILE__ );
3030
define( 'ANG_PLUGIN_URL', plugin_dir_url( ANG_PLUGIN_FILE ) );
3131
define( 'ANG_PLUGIN_DIR', plugin_dir_path( ANG_PLUGIN_FILE ) );
@@ -200,7 +200,7 @@ function sk_fs() {
200200
'type' => 'plugin',
201201
'public_key' => 'pk_e05579cda0ad78db31e94616185cc',
202202
'is_premium' => false,
203-
'has_addons' => false,
203+
'has_addons' => true,
204204
'has_paid_plans' => false,
205205
'menu' => array(
206206
'slug' => 'analogwp_templates',

‎freemius/assets/img/style-kits-pr.png

3.72 KB
Loading

‎freemius/templates/account/partials/addon.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
$addon_info = $VARS['addon_info'];
2121
$is_addon_activated = $fs->is_addon_activated( $addon_id );
22-
$is_addon_connected = $addon_info['is_connected'];
22+
$is_addon_connected = isset( $addon_info['is_connected'] ) ? $addon_info['is_connected'] : false;
2323
$is_addon_installed = $VARS['is_addon_installed'];
2424

2525
$fs_addon = ( $is_addon_connected && $is_addon_installed ) ?
@@ -150,7 +150,7 @@
150150
} ?>>
151151
<td>
152152
<!-- Title -->
153-
<?php echo $addon_info['title'] ?>
153+
<?php if ( isset( $addon_info['title'] ) ) { echo $addon_info['title']; } ?>
154154
</td>
155155
<?php if ( $is_addon_connected ) : ?>
156156
<!-- ID -->

‎inc/Database_Upgrader.php

+11
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public function init() {
4141
'2.0.5' => 'upgrade_2_0_5',
4242
'2.0.6' => 'upgrade_2_0_6',
4343
'2.1.0' => 'upgrade_2_1',
44+
'2.2.1' => 'upgrade_2_2_1',
4445
);
4546

4647
$version = get_option( self::OPTION, '0.0.0' );
@@ -195,4 +196,14 @@ protected function upgrade_2_1() {
195196
// Refresh templates library.
196197
Remote::get_instance()->get_templates_info( true );
197198
}
199+
200+
/**
201+
* Migration for v2.2.1
202+
*
203+
* @return void
204+
*/
205+
protected function upgrade_2_2_1() {
206+
// Refresh templates library.
207+
Remote::get_instance()->get_templates_info( true );
208+
}
198209
}

‎inc/Plugin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function send_strings_to_app( $domains ) {
174174
),
175175
),
176176
'adminURL' => admin_url( 'admin.php?page=ang-settings&tab=general#global_kit' ),
177-
'blockMediaURL' => 'https://bs.analogwp.com/',
177+
'blockMediaURL' => 'https://ss.analogwp.com/',
178178
'isGlobalSkEnabled' => (bool) Options::get_instance()->get( 'use_global_sk' ),
179179
'globalSkAlwaysEnableURL' => admin_url( 'admin.php?page=style-kits' ),
180180
'isContainer' => Utils::is_container(),

‎inc/elementor/class-typography.php

+3-29
Original file line numberDiff line numberDiff line change
@@ -432,24 +432,13 @@ public function register_container_spacing( Controls_Stack $element, $section_id
432432
);
433433

434434
$no_padding_styles = array(
435-
'{{WRAPPER}} .elementor-repeater-item-ang_container_no_padding.elementor-element' => '--padding-block-start: 0px; --padding-inline-end: 0px; --padding-block-end: 0px; --padding-inline-start: 0px;',
435+
'{{WRAPPER}} .elementor-repeater-item-ang_container_no_padding.elementor-element' => '--padding-top: 0px; --padding-right: 0px; --padding-bottom: 0px; --padding-left: 0px;',
436436
);
437437

438438
$padding_preset_styles = array(
439-
'{{WRAPPER}} {{CURRENT_ITEM}}.elementor-element' => '--padding-block-start: {{TOP}}{{UNIT}}; --padding-inline-end: {{RIGHT}}{{UNIT}}; --padding-block-end: {{BOTTOM}}{{UNIT}}; --padding-inline-start: {{LEFT}}{{UNIT}}',
439+
'{{WRAPPER}} {{CURRENT_ITEM}}.elementor-element' => '--padding-top: {{TOP}}{{UNIT}}; --padding-right: {{RIGHT}}{{UNIT}}; --padding-bottom: {{BOTTOM}}{{UNIT}}; --padding-left: {{LEFT}}{{UNIT}}',
440440
);
441441

442-
// Backwards compatibility with v3.15.3 and lower.
443-
if ( Utils::is_elementor_pre( '3.16.0' ) ) {
444-
$no_padding_styles = array(
445-
'{{WRAPPER}} .elementor-repeater-item-ang_container_no_padding.elementor-element' => '--padding-top: 0px; --padding-right: 0px; --padding-bottom: 0px; --padding-left: 0px;',
446-
);
447-
448-
$padding_preset_styles = array(
449-
'{{WRAPPER}} {{CURRENT_ITEM}}.elementor-element' => '--padding-top: {{TOP}}{{UNIT}}; --padding-right: {{RIGHT}}{{UNIT}}; --padding-bottom: {{BOTTOM}}{{UNIT}}; --padding-left: {{LEFT}}{{UNIT}}',
450-
);
451-
}
452-
453442
// Hack for adding no padding styles at container presets.
454443
$element->add_control(
455444
'ang_container_no_padding_hidden',
@@ -783,21 +772,6 @@ public function register_columns_gap( Controls_Stack $element, $section_id ) {
783772

784773
$elementor_row = '';
785774

786-
if ( Utils::is_elementor_pre( '3.19.0' ) ) {
787-
788-
$optimized_dom = get_option( 'elementor_experiment-e_dom_optimization' );
789-
$is_optimize_dom = \Elementor\Core\Experiments\Manager::STATE_ACTIVE === $optimized_dom;
790-
791-
if ( 'default' === $optimized_dom ) {
792-
$experiments = new \Elementor\Core\Experiments\Manager();
793-
$is_optimize_dom = $experiments->is_feature_active( 'e_dom_optimization' );
794-
}
795-
796-
if ( ! $is_optimize_dom ) { // Add row class if DOM optimization is not active.
797-
$elementor_row = ' > .elementor-row ';
798-
}
799-
}
800-
801775
foreach ( $gaps as $key => $label ) {
802776
$element->add_responsive_control(
803777
'ang_column_gap_' . $key,
@@ -2382,7 +2356,7 @@ public function tweak_container_borders( Element_Base $element ) {
23822356
array(
23832357
'label' => __( 'Box Shadow Preset', 'ang' ),
23842358
'type' => Controls_Manager::SELECT,
2385-
'hide_in_inner' => true,
2359+
'hide_in_inner' => false,
23862360
'default' => 'none',
23872361
'options' => $options,
23882362
'prefix_class' => 'elementor-repeater-item-',

0 commit comments

Comments
 (0)