' . $desc;
- }
-
- return sprintf(
- '
-
-
-
- %s',
- $field['id'],
- $field['name'],
- $desc
- );
+ return parent::begin_html( $field ) . parent::input_description( $field );
}
protected static function input_description( array $field ) : string {
diff --git a/modules/meta-box/js/date.js b/modules/meta-box/js/date.js
index 3a8451f..ee99109 100644
--- a/modules/meta-box/js/date.js
+++ b/modules/meta-box/js/date.js
@@ -5,23 +5,28 @@
* Transform an input into a date picker.
*/
function transform() {
- var $this = $( this ),
- options = $this.data( 'options' ),
- $inline = $this.siblings( '.rwmb-datetime-inline' ),
- $timestamp = $this.siblings( '.rwmb-datetime-timestamp' ),
+ let $this = $( this ),
+ options = $this.data( 'options' );
+
+ let $inline = $this.siblings( '.rwmb-datetime-inline' );
+ if ( !$inline.length ) {
+ $inline = $this.closest( '.rwmb-input-group' ).siblings( '.rwmb-datetime-inline' );
+ }
+
+ let $timestamp = $this.siblings( '.rwmb-datetime-timestamp' ),
current = $this.val(),
$picker = $inline.length ? $inline : $this;
$this.siblings( '.ui-datepicker-append' ).remove(); // Remove appended text
- options.onSelect = function() {
+ options.onSelect = function () {
$this.trigger( 'change' );
- }
- options.beforeShow = function( i ) {
+ };
+ options.beforeShow = function ( i ) {
if ( $( i ).prop( 'readonly' ) ) {
return false;
}
- }
+ };
if ( $timestamp.length ) {
options.onClose = options.onSelect = function () {
@@ -36,7 +41,7 @@
} );
}
- if ( ! $inline.length ) {
+ if ( !$inline.length ) {
$this.removeClass( 'hasDatepicker' ).datepicker( options );
return;
}
@@ -44,7 +49,7 @@
options.altField = '#' + $this.attr( 'id' );
$this.on( 'keydown', _.debounce( function () {
// if val is empty, return to allow empty datepicker input.
- if ( ! $this.val() ) {
+ if ( !$this.val() ) {
return;
}
$picker
diff --git a/modules/meta-box/js/datetime.js b/modules/meta-box/js/datetime.js
index e8d1c72..5cf26f8 100644
--- a/modules/meta-box/js/datetime.js
+++ b/modules/meta-box/js/datetime.js
@@ -5,23 +5,28 @@
* Transform an input into a datetime picker.
*/
function transform() {
- var $this = $( this ),
- options = $this.data( 'options' ),
- $inline = $this.siblings( '.rwmb-datetime-inline' ),
- $timestamp = $this.siblings( '.rwmb-datetime-timestamp' ),
+ let $this = $( this ),
+ options = $this.data( 'options' );
+
+ let $inline = $this.siblings( '.rwmb-datetime-inline' );
+ if ( !$inline.length ) {
+ $inline = $this.closest( '.rwmb-input-group' ).siblings( '.rwmb-datetime-inline' );
+ }
+
+ let $timestamp = $this.siblings( '.rwmb-datetime-timestamp' ),
current = $this.val(),
$picker = $inline.length ? $inline : $this;
$this.siblings( '.ui-datepicker-append' ).remove(); // Remove appended text
- options.onSelect = function() {
+ options.onSelect = function () {
$this.trigger( 'change' );
- }
- options.beforeShow = function( i ) {
+ };
+ options.beforeShow = function ( i ) {
if ( $( i ).prop( 'readonly' ) ) {
return false;
}
- }
+ };
if ( $timestamp.length ) {
options.onClose = options.onSelect = function () {
@@ -36,7 +41,7 @@
} );
}
- if ( ! $inline.length ) {
+ if ( !$inline.length ) {
$this.removeClass( 'hasDatepicker' ).datetimepicker( options );
return;
}
@@ -44,7 +49,7 @@
options.altField = '#' + $this.attr( 'id' );
$this.on( 'keydown', _.debounce( function () {
// if val is empty, return to allow empty datepicker input.
- if ( ! $this.val() ) {
+ if ( !$this.val() ) {
return;
}
$picker
@@ -78,9 +83,9 @@
// Set language if available
function setTimeI18n() {
if ( $.timepicker.regional.hasOwnProperty( i18n.locale ) ) {
- $.timepicker.setDefaults( $.timepicker.regional[i18n.locale] );
+ $.timepicker.setDefaults( $.timepicker.regional[ i18n.locale ] );
} else if ( $.timepicker.regional.hasOwnProperty( i18n.localeShort ) ) {
- $.timepicker.setDefaults( $.timepicker.regional[i18n.localeShort] );
+ $.timepicker.setDefaults( $.timepicker.regional[ i18n.localeShort ] );
}
}
diff --git a/modules/meta-box/js/image-select.js b/modules/meta-box/js/image-select.js
deleted file mode 100644
index 6365f8e..0000000
--- a/modules/meta-box/js/image-select.js
+++ /dev/null
@@ -1,27 +0,0 @@
-( function ( $, rwmb ) {
- 'use strict';
-
- function setActiveClass() {
- var $this = $( this ),
- type = $this.attr( 'type' ),
- selected = $this.is( ':checked' ),
- $parent = $this.parent(),
- $others = $parent.siblings();
- if ( selected ) {
- $parent.addClass( 'rwmb-active' );
- if ( type === 'radio' ) {
- $others.removeClass( 'rwmb-active' );
- }
- } else {
- $parent.removeClass( 'rwmb-active' );
- }
- }
-
- function init( e ) {
- $( e.target ).find( '.rwmb-image-select input' ).trigger( 'change' );
- }
-
- rwmb.$document
- .on( 'mb_ready', init )
- .on( 'change', '.rwmb-image-select input', setActiveClass );
-} )( jQuery, rwmb );
diff --git a/modules/meta-box/js/time.js b/modules/meta-box/js/time.js
index 8b0335b..d4ba9e0 100644
--- a/modules/meta-box/js/time.js
+++ b/modules/meta-box/js/time.js
@@ -5,9 +5,8 @@
* Transform an input into a time picker.
*/
function transform() {
- var $this = $( this ),
+ let $this = $( this ),
options = $this.data( 'options' ),
- $inline = $this.siblings( '.rwmb-datetime-inline' ),
current = $this.val();
current = formatTime( current );
@@ -22,6 +21,10 @@
}
};
+ let $inline = $this.siblings( '.rwmb-datetime-inline' );
+ if ( !$inline.length ) {
+ $inline = $this.closest( '.rwmb-input-group' ).siblings( '.rwmb-datetime-inline' );
+ }
if ( !$inline.length ) {
$this.removeClass( 'hasDatepicker' ).timepicker( options ).timepicker( 'setTime', current );
return;
diff --git a/modules/meta-box/src/Updater/Checker.php b/modules/meta-box/src/Updater/Checker.php
index 8cbb62e..55720e9 100644
--- a/modules/meta-box/src/Updater/Checker.php
+++ b/modules/meta-box/src/Updater/Checker.php
@@ -15,19 +15,19 @@ public function init() {
add_action( 'init', [ $this, 'enable_update' ], 1 );
}
- public function enable_update() {
- if ( $this->has_extensions() ) {
+ public function enable_update(): void {
+ if ( $this->has_extensions() || $this->has_free_extensions() ) {
add_filter( 'pre_set_site_transient_update_plugins', [ $this, 'check_updates' ] );
add_filter( 'plugins_api', [ $this, 'get_info' ], 10, 3 );
}
}
- public function has_extensions() {
+ public function has_extensions(): bool {
$extensions = $this->get_extensions();
return ! empty( $extensions );
}
- public function get_extensions() {
+ public function get_extensions(): array {
if ( ! function_exists( 'get_plugins' ) ) {
require_once ABSPATH . 'wp-admin/includes/plugin.php';
}
@@ -65,6 +65,25 @@ public function get_extensions() {
return array_intersect( $extensions, $plugins );
}
+ private function has_free_extensions(): bool {
+ $extensions = $this->get_free_extensions();
+ return ! empty( $extensions );
+ }
+
+ private function get_free_extensions(): array {
+ if ( ! function_exists( 'get_plugins' ) ) {
+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
+ }
+
+ $extensions = [
+ 'meta-box-lite',
+ ];
+ $plugins = get_plugins();
+ $plugins = array_map( 'dirname', array_keys( $plugins ) );
+
+ return array_intersect( $extensions, $plugins );
+ }
+
/**
* Check plugin for updates
*
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index e238f19..49d4e0d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -819,12 +819,12 @@
},
{
"name": "wpmetabox/meta-box",
- "version": "5.10.5",
- "version_normalized": "5.10.5.0",
+ "version": "dev-master",
+ "version_normalized": "dev-master",
"source": {
"type": "git",
"url": "git@github.com:wpmetabox/meta-box.git",
- "reference": "3fa649ba0e8624c71f066a8437a4a47af5998710"
+ "reference": "9e243e8d8cbfbd3ef69218a441619394374a1708"
},
"require": {
"meta-box/support": "dev-master"
@@ -832,7 +832,8 @@
"require-dev": {
"phpunit/phpunit": "^11.3"
},
- "time": "2024-12-16T06:50:30+00:00",
+ "time": "2025-01-09T08:25:10+00:00",
+ "default-branch": true,
"type": "wordpress-plugin",
"extra": {
"dev-files": {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 08e598e..29b4866 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '5f2dc7eef0622809b122e35020a5791b6ca5b483',
+ 'reference' => 'aa429e6fa625dc45861768197aa221e03522f43b',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '5f2dc7eef0622809b122e35020a5791b6ca5b483',
+ 'reference' => 'aa429e6fa625dc45861768197aa221e03522f43b',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -204,12 +204,14 @@
'dev_requirement' => false,
),
'wpmetabox/meta-box' => array(
- 'pretty_version' => '5.10.5',
- 'version' => '5.10.5.0',
- 'reference' => '3fa649ba0e8624c71f066a8437a4a47af5998710',
+ 'pretty_version' => 'dev-master',
+ 'version' => 'dev-master',
+ 'reference' => '9e243e8d8cbfbd3ef69218a441619394374a1708',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../modules/meta-box',
- 'aliases' => array(),
+ 'aliases' => array(
+ 0 => '9999999-dev',
+ ),
'dev_requirement' => false,
),
'wpmetabox/meta-box-beaver-themer-integrator' => array(