Skip to content

Prepare for 6.11 #1818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crabcyborg merged 2 commits into from
Jun 19, 2024
Merged

Prepare for 6.11 #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
499eb2b
Update since versions
Crabcyborg Jun 19, 2024
af4f6be
Prepare for v6.11
Crabcyborg Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/controllers/FrmAppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ public static function admin_js() {
/**
* Avoid loading dropzone CSS on the form list page. It isn't required there.
*
* @since x.x
* @since 6.11
*
* @param string $page
* @return void
Expand Down
2 changes: 1 addition & 1 deletion classes/controllers/FrmFormsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class FrmFormsController {
* The HTML for the Formdiable TinyMCE button (That triggers a popup to insert shortcodes)
* is stored here and re-used as an optimization.
*
* @since x.x
* @since 6.11
*
* @var string|null
*/
Expand Down
2 changes: 1 addition & 1 deletion classes/helpers/FrmAppHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class FrmAppHelper {
*
* @var string
*/
public static $plug_version = '6.10';
public static $plug_version = '6.11';

/**
* @var bool
Expand Down
4 changes: 2 additions & 2 deletions classes/helpers/FrmFormsHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,13 +1786,13 @@ public static function publish_box_button_text() {

/**
* @since 3.0
* @deprecated x.x
* @deprecated 6.11
*
* @param array $atts
* @return void
*/
public static function actions_dropdown( $atts ) {
_deprecated_function( __METHOD__, 'x.x' );
_deprecated_function( __METHOD__, '6.11' );

if ( ! FrmAppHelper::is_admin_page( 'formidable' ) ) {
return;
Expand Down
4 changes: 2 additions & 2 deletions classes/helpers/FrmStylesHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static function get_css_label_positions() {
}

/**
* @since x.x Added $field param.
* @since 6.11 Added $field param.
*
* @param array|object $field
*
Expand All @@ -59,7 +59,7 @@ public static function get_single_label_positions( $field = array() ) {
/**
* Allows updating label positions in field settings.
*
* @since x.x
* @since 6.11
*
* @param array $label_positions
* @param array|object $field
Expand Down
2 changes: 1 addition & 1 deletion classes/views/frm-forms/actions-dropdown.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
if ( ! defined( 'ABSPATH' ) ) {
die( 'You are not allowed to call this page directly.' );
}
_deprecated_file( esc_html( basename( __FILE__ ) ), 'x.x' );
_deprecated_file( esc_html( basename( __FILE__ ) ), '6.11' );
?>
<div class="frm_actions_dropdown dropdown <?php echo esc_attr( is_rtl() ? 'dropdown-menu-right' : 'dropdown-menu-left' ); ?>">
<a href="#" id="frm-actionsDrop" class="frm-dropdown-toggle frm_icon_font frm_option_icon" data-toggle="dropdown" title="<?php esc_attr_e( 'Show options', 'formidable' ); ?>"></a>
Expand Down
2 changes: 1 addition & 1 deletion formidable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: Formidable Forms
* Description: Quickly and easily create drag-and-drop forms
* Version: 6.10
* Version: 6.11
* Plugin URI: https://formidableforms.com/
* Author URI: https://formidableforms.com/
* Author: Strategy11 Form Builder Team
Expand Down
52 changes: 25 additions & 27 deletions js/formidable.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/formidable_admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8020,7 +8020,7 @@ function frmAdminBuildJS() {
* We only expect one layout class to exist for a given field.
* For example, if a field has frm_half and we set it to frm_third, frm_half will be removed.
*
* @since x.x
* @since 6.11
*
* @param {HTMLElement} obj
* @param {string} variable
Expand All @@ -8040,7 +8040,7 @@ function frmAdminBuildJS() {
/**
* Check if a given class is a layout class.
*
* @since x.x
* @since 6.11
*
* @param {string} className
* @return {boolean}
Expand All @@ -8051,7 +8051,7 @@ function frmAdminBuildJS() {
}

/**
* @since x.x
* @since 6.11
*
* @param {string} beforeValue
* @param {Array} removeClasses
Expand Down
Loading