link(); ?>>
+ link(); ?>>
choices as $value => $name ) {
@@ -41,7 +43,7 @@ public function render_content() {
echo 'value(), $value, false ) . '>' . esc_html( $name ) . ' ';
}
- } // /foreach
+ }
?>
diff --git a/library/includes/classes/class-customize-styles.php b/library/includes/classes/class-customize-styles.php
index a69adba..7a9b7a4 100644
--- a/library/includes/classes/class-customize-styles.php
+++ b/library/includes/classes/class-customize-styles.php
@@ -6,11 +6,14 @@
* @uses `wmhook_modern_custom_styles` global hook
* @uses `wmhook_modern_custom_styles_alphas` global hook
*
- * @package WebMan WordPress Theme Framework
* @subpackage Customize
+ * @subpackage Stylesheet Generator
+ *
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
*
* @since 1.8.0
- * @version 2.6.0
+ * @version 2.7.0
*
* Contents:
*
@@ -132,8 +135,10 @@ public static function init() {
/**
* Generate main CSS file
*
+ * @subpackage Customize Options
+ *
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*
* @param string $scope
*/
@@ -141,10 +146,16 @@ public static function generate_main_css( $scope = '' ) {
// Pre
- $scope = '-' . trim( (string) apply_filters( 'wmhook_modern_library_generate_main_css_scope', $scope ), ' -' );
- $pre = apply_filters( 'wmhook_modern_library_generate_main_css_pre', ! self::$supports_generator, $scope );
+ $scope = trim( (string) apply_filters( 'wmhook_modern_library_generate_main_css_scope', $scope ), ' -' );
- if ( false !== $pre ) {
+ if ( ! empty( $scope ) ) {
+ $scope = '-' . $scope;
+ }
+
+ $pre = ( self::$supports_generator ) ? ( null ) : ( false );
+ $pre = apply_filters( 'wmhook_modern_library_generate_main_css_pre', $pre, $scope );
+
+ if ( null !== $pre ) {
return $pre;
}
@@ -153,8 +164,7 @@ public static function generate_main_css( $scope = '' ) {
$output = $output_min = '';
- $filesystem = self::get_filesystem();
-
+ $filesystem = self::get_filesystem();
$required_file = MODERN_PATH . 'assets/css-generate/generate-css' . $scope . '.php';
@@ -176,7 +186,7 @@ public static function generate_main_css( $scope = '' ) {
ob_start();
require_once $required_file;
- $output = apply_filters( 'wmhook_modern_library_generate_main_css_output', trim( ob_get_clean() ), $scope );
+ $output = (string) apply_filters( 'wmhook_modern_library_generate_main_css_output', trim( ob_get_clean() ), $scope );
// Requirements check
@@ -186,7 +196,7 @@ public static function generate_main_css( $scope = '' ) {
// Minify output if set
- $output_min = apply_filters( 'wmhook_modern_library_generate_main_css_output_min', $output, $scope );
+ $output_min = (string) apply_filters( 'wmhook_modern_library_generate_main_css_output_min', $output, $scope );
// Create the theme CSS folder
@@ -205,16 +215,11 @@ public static function generate_main_css( $scope = '' ) {
* and exit the method returning `false`.
*/
- set_transient(
- 'modern_admin_notice',
- array(
- '' . esc_html__( "ERROR: Wasn't able to create a theme CSS folder! Contact the theme support.", 'modern' ) . ' ',
- 'notice-error',
- 'edit_theme_options',
- 2
- ),
- ( 60 * 60 * 48 )
- );
+ error_log(
+ __METHOD__ . ': '
+ . 'ERROR: '
+ . 'Theme "' . get_template() . '" was not able to create "' . $theme_css_dir . '" directory.'
+ );
remove_theme_mod( '__url_css' . $scope );
remove_theme_mod( '__path_theme_generated_files' . $scope );
@@ -225,12 +230,12 @@ public static function generate_main_css( $scope = '' ) {
// Create the theme CSS files
- $file_name = apply_filters( 'wmhook_modern_library_generate_main_css_file_name', 'modern-styles' . $scope, $scope );
+ $file_name = (string) apply_filters( 'wmhook_modern_library_generate_main_css_file_name', 'modern-styles' . $scope, $scope );
- $global_css_path = apply_filters( 'wmhook_modern_library_generate_main_css_global_css_path', trailingslashit( $theme_css_dir ) . $file_name . '.css', $scope, $file_name, $theme_css_dir );
- $global_css_path_dev = apply_filters( 'wmhook_modern_library_generate_main_css_global_css_path_dev', trailingslashit( $theme_css_dir ) . 'dev-' . $file_name . '.css', $scope, $file_name, $theme_css_dir );
+ $global_css_path = (string) apply_filters( 'wmhook_modern_library_generate_main_css_global_css_path', trailingslashit( $theme_css_dir ) . $file_name . '.css', $scope, $file_name, $theme_css_dir );
+ $global_css_path_dev = (string) apply_filters( 'wmhook_modern_library_generate_main_css_global_css_path_dev', trailingslashit( $theme_css_dir ) . 'dev-' . $file_name . '.css', $scope, $file_name, $theme_css_dir );
- $global_css_url = apply_filters( 'wmhook_modern_library_generate_main_css_global_css_url', trailingslashit( $theme_css_url ) . $file_name . '.css', $scope, $file_name, $theme_css_url );
+ $global_css_url = (string) apply_filters( 'wmhook_modern_library_generate_main_css_global_css_url', trailingslashit( $theme_css_url ) . $file_name . '.css', $scope, $file_name, $theme_css_url );
if (
$output
@@ -334,6 +339,8 @@ public static function generate_main_css_all() {
/**
* Saves stylesheet regeneration timestamp into theme options
*
+ * @subpackage Customize Options
+ *
* @since 2.3.0
* @version 2.3.0
*/
@@ -369,8 +376,10 @@ public static function stylesheet_timestamp() {
* @uses `wmhook_modern_custom_styles` global hook
* @uses `wmhook_modern_custom_styles_alphas` global hook
*
+ * @subpackage Customize Options
+ *
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*
* @param string $css CSS string with variables to replace.
* @param string $scope Optional CSS scope (such as 'editor' for generating editor styles).
@@ -382,7 +391,7 @@ public static function custom_styles( $css = '', $scope = '' ) {
$pre = apply_filters( 'wmhook_modern_library_custom_styles_pre', false, $css, $scope );
if ( false !== $pre ) {
- return $pre;
+ return ( is_string( $pre ) ) ? ( $pre ) : ( $css );
}
@@ -457,31 +466,9 @@ public static function custom_styles( $css = '', $scope = '' ) {
continue;
}
- // If we have an ID, get the default value if set
-
- if ( isset( $option['default'] ) && 'image' !== $option['type'] ) {
- $value = $option['default'];
- }
+ // Get modified option value or fall back to default
- // Get the option value saved in database and apply it when exists
-
- $mod = get_theme_mod( $option_id );
-
- /**
- * As this is producing CSS output, we allow checking
- * for an empty or zero value with checkbox and range controls.
- * Checkbox can be used in conditional comments in CSS for example (see below).
- * Also image control can have a value of `false` in which case the
- * option default value is used. If the image control is of empty string
- * the `none` is set as value.
- */
- if (
- $mod
- || is_numeric( $mod )
- || in_array( $option['type'], array( 'checkbox', 'image' ) )
- ) {
- $value = $mod;
- }
+ $value = Modern_Library_Customize::get_theme_mod( $option_id, $option );
// Make sure the color value contains '#'
@@ -504,8 +491,6 @@ public static function custom_styles( $css = '', $scope = '' ) {
if ( ! empty( $value ) ) {
$value = "url('" . esc_url( $value ) . "')";
- } elseif ( false === $value ) {
- $value = "url('" . esc_url( $option['default'] ) . "')";
} else {
$value = 'none';
}
@@ -515,34 +500,27 @@ public static function custom_styles( $css = '', $scope = '' ) {
// CSS output
if ( isset( $option['css_output'] ) ) {
-
switch ( $option['css_output'] ) {
+
case 'comma_list':
case 'comma_list_quoted':
-
- if ( is_array( $value ) ) {
-
- if ( 'comma_list_quoted' == $option['css_output'] ) {
- $value = "'" . implode( "', '", $value ) . "'";
- } else {
- $value = implode( ', ', $value );
- }
-
+ if ( is_array( $value ) ) {
+ if ( 'comma_list_quoted' == $option['css_output'] ) {
+ $value = "'" . implode( "', '", $value ) . "'";
+ } else {
+ $value = implode( ', ', $value );
}
-
- $value .= ',';
-
+ }
+ $value .= ',';
break;
default:
-
- if ( is_callable( $option['css_output'] ) ) {
- $value = call_user_func( $option['css_output'], $value, $option );
- }
-
+ if ( is_callable( $option['css_output'] ) ) {
+ $value = call_user_func( $option['css_output'], $value, $option );
+ }
break;
- } // /switch
+ }
}
// Value filtering
@@ -566,7 +544,7 @@ public static function custom_styles( $css = '', $scope = '' ) {
if ( 'color' === $option['type'] && ! empty( $rgba_alphas ) ) {
foreach ( $rgba_alphas as $alpha ) {
$replacements[ '[[' . $css_option_id . '(' . absint( $alpha ) . ')]]' ] = self::color_hex_to_rgba( $value, absint( $alpha ) );
- } // /foreach
+ }
}
// Option related conditional CSS comment
@@ -587,7 +565,7 @@ public static function custom_styles( $css = '', $scope = '' ) {
}
- } // /foreach
+ }
// Add WordPress Custom Background and Header support
@@ -599,7 +577,7 @@ public static function custom_styles( $css = '', $scope = '' ) {
if ( ! empty( $rgba_alphas ) ) {
foreach ( $rgba_alphas as $alpha ) {
$replacements[ '[[background_color(' . absint( $alpha ) . ')]]' ] = self::color_hex_to_rgba( $value, absint( $alpha ) );
- } // /foreach
+ }
}
}
@@ -619,7 +597,7 @@ public static function custom_styles( $css = '', $scope = '' ) {
if ( ! empty( $rgba_alphas ) ) {
foreach ( $rgba_alphas as $alpha ) {
$replacements[ '[[header_textcolor(' . absint( $alpha ) . ')]]' ] = self::color_hex_to_rgba( $value, absint( $alpha ) );
- } // /foreach
+ }
}
}
@@ -655,8 +633,8 @@ public static function custom_styles( $css = '', $scope = '' ) {
$cache = (array) get_transient( self::$cache_key );
- $cache['debug'][ $scope ] = apply_filters( 'wmhook_modern_library_custom_styles_output_cache_debug', $output, $scope );
- $cache[ $scope ] = apply_filters( 'wmhook_modern_library_custom_styles_output_cache', $output, $scope );
+ $cache['debug'][ $scope ] = (string) apply_filters( 'wmhook_modern_library_custom_styles_output_cache_debug', $output, $scope );
+ $cache[ $scope ] = (string) apply_filters( 'wmhook_modern_library_custom_styles_output_cache', $output, $scope );
$cache['__replacements'] = (array) $replacements;
set_transient( self::$cache_key, $cache );
@@ -715,7 +693,7 @@ public static function custom_styles_cache_flush() {
* @see http://wordpress.findincity.net/view/63538464303732726692954/using-wpfilesystem-in-plugins-to-store-customizer-settings
*
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*/
public static function get_filesystem() {
@@ -746,17 +724,13 @@ public static function get_filesystem() {
&& ! defined( 'FTP_USER' )
) {
- // If we don't have filesystem access, display an admin notice
-
- set_transient(
- 'modern_admin_notice',
- array(
- esc_html__( 'The theme writes a files to your server. You do not appear to have your FTP credentials set up in "wp-config.php" file.', 'modern' ) . ' ' . esc_html__( 'Please set your FTP credentials first.', 'modern' ) . ' ',
- 'notice-error',
- 'edit_theme_options'
- ),
- ( 60 * 60 * 24 )
- );
+ error_log(
+ __METHOD__ . ': '
+ . 'ERROR: '
+ . 'Theme "' . get_template() . '" could not get access to your server to write files to WordPress uploads directory.'
+ . ' '
+ . 'Please try to set up FTP credentials in your "wp-confix.php" file (https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants) to fix the issue.'
+ );
return false;
@@ -788,7 +762,7 @@ public static function get_filesystem() {
* CSS minifier
*
* @since 1.0.0
- * @version 2.0.0
+ * @version 2.7.0
*
* @param string $css Code to minimize
*/
@@ -799,7 +773,7 @@ public static function minify_css( $css ) {
$pre = apply_filters( 'wmhook_modern_library_minify_css_pre', false, $css );
if ( false !== $pre ) {
- return $pre;
+ return ( is_string( $pre ) ) ? ( $pre ) : ( $css );
}
@@ -818,7 +792,7 @@ public static function minify_css( $css ) {
// Remove tabs, spaces, line breaks, etc.
- $css = str_replace( array( "\r\n", "\r", "\n", "\t" ), '', $css );
+ $css = str_replace( array( PHP_EOL, "\t" ), '', $css );
$css = str_replace( array( ' ', ' ', ' ', ' ' ), ' ', $css );
$css = str_replace( array( ' { ', ': ', '; }' ), array( '{', ':', '}' ), $css );
diff --git a/library/includes/classes/class-customize.php b/library/includes/classes/class-customize.php
index 9805e4e..feab315 100644
--- a/library/includes/classes/class-customize.php
+++ b/library/includes/classes/class-customize.php
@@ -4,17 +4,20 @@
*
* @uses `wmhook_modern_theme_options` global hook
*
- * @package WebMan WordPress Theme Framework
* @subpackage Customize
*
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ *
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*
* Contents:
*
* 0) Init
* 10) Assets
* 20) Customizer core
+ * 30) Getters
*/
final class Modern_Library_Customize {
@@ -28,6 +31,10 @@ final class Modern_Library_Customize {
private static $instance;
+ public static $mods = false;
+
+ public static $theme_options_setup = false;
+
/**
@@ -89,7 +96,7 @@ public static function init() {
* Customizer controls assets
*
* @since 1.0.0
- * @version 2.2.6
+ * @version 2.7.0
*/
public static function assets() {
@@ -98,12 +105,12 @@ public static function assets() {
// Styles
wp_enqueue_style(
- 'modern-customize-controls',
- get_theme_file_uri( MODERN_LIBRARY_DIR . 'css/customize.css' ),
- false,
- esc_attr( MODERN_THEME_VERSION ),
- 'screen'
- );
+ 'modern-customize-controls',
+ get_theme_file_uri( MODERN_LIBRARY_DIR . 'css/customize.css' ),
+ false,
+ MODERN_THEME_VERSION,
+ 'screen'
+ );
// RTL setup
@@ -112,12 +119,12 @@ public static function assets() {
// Scripts
wp_enqueue_script(
- 'modern-customize-controls',
- get_theme_file_uri( MODERN_LIBRARY_DIR . 'js/customize-controls.js' ),
- array( 'customize-controls' ),
- esc_attr( MODERN_THEME_VERSION ),
- true
- );
+ 'modern-customize-controls',
+ get_theme_file_uri( MODERN_LIBRARY_DIR . 'js/customize-controls.js' ),
+ array( 'customize-controls' ),
+ MODERN_THEME_VERSION,
+ true
+ );
} // /assets
@@ -152,34 +159,34 @@ public static function assets() {
*
* 'css' => array(
*
- * // Sets the whole value to the `css-property-name` of the `selector`
+ * // Sets the whole value to the `css-property-name` of the `selector`
*
- * 'selector' => array(
- * 'background-color',...
- * ),
+ * 'selector' => array(
+ * 'background-color',...
+ * ),
*
- * // Sets the `css-property-name` of the `selector` with specific settings
+ * // Sets the `css-property-name` of the `selector` with specific settings
*
- * 'selector' => array(
- * array(
- * 'property' => 'text-shadow',
- * 'prefix' => '0 1px 1px rgba(',
- * 'suffix' => ', .5)',
- * 'process_callback' => 'hexToRgb',
- * 'custom' => '0 0 0 1em [[value]] ), 0 0 0 2em transparent, 0 0 0 3em [[value]]',
- * ),...
- * ),
+ * 'selector' => array(
+ * array(
+ * 'property' => 'text-shadow',
+ * 'prefix' => '0 1px 1px rgba(',
+ * 'suffix' => ', .5)',
+ * 'process_callback' => 'hexToRgb',
+ * 'custom' => '0 0 0 1em [[value]] ), 0 0 0 2em transparent, 0 0 0 3em [[value]]',
+ * ),...
+ * ),
*
- * // Replaces "@" in `selector` for `selector-replace-value` (such as "@ h2, @ h3" to ".footer h2, .footer h3")
+ * // Replaces "@" in `selector` for `selector-replace-value` (such as "@ h2, @ h3" to ".footer h2, .footer h3")
*
- * 'selector' => array(
- * 'selector_replace' => 'selector-replace-value',
- * 'selector_before' => '@media only screen and (min-width: 80em) {',
- * 'selector_after' => '}',
- * 'background-color',...
- * ),
+ * 'selector' => array(
+ * 'selector_replace' => 'selector-replace-value',
+ * 'selector_before' => '@media only screen and (min-width: 80em) {',
+ * 'selector_after' => '}',
+ * 'background-color',...
+ * ),
*
- * ),
+ * ),
*
* // And/or setting custom JavaScript:
*
@@ -189,8 +196,10 @@ public static function assets() {
*
* @uses `wmhook_modern_theme_options` global hook
*
+ * @subpackage Customize Options
+ *
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*/
public static function preview_scripts() {
@@ -199,13 +208,13 @@ public static function preview_scripts() {
$pre = apply_filters( 'wmhook_modern_library_customize_preview_scripts_pre', false );
if ( false !== $pre ) {
- return $pre;
+ return (string) $pre;
}
// Helper variables
- $theme_options = apply_filters( 'wmhook_modern_theme_options', array() );
+ $theme_options = (array) apply_filters( 'wmhook_modern_theme_options', array() );
ksort( $theme_options );
@@ -215,25 +224,22 @@ public static function preview_scripts() {
// Processing
if ( is_array( $theme_options ) && ! empty( $theme_options ) ) {
-
foreach ( $theme_options as $theme_option ) {
-
if ( isset( $theme_option['preview_js'] ) && is_array( $theme_option['preview_js'] ) ) {
- $output_single = "wp.customize(" . "\r\n";
- $output_single .= "\t" . "'" . $theme_option['id'] . "'," . "\r\n";
- $output_single .= "\t" . "function( value ) {" . "\r\n";
- $output_single .= "\t\t" . 'value.bind( function( to ) {' . "\r\n";
+ $output_single = "wp.customize(" . PHP_EOL;
+ $output_single .= "\t" . "'" . $theme_option['id'] . "'," . PHP_EOL;
+ $output_single .= "\t" . "function( value ) {" . PHP_EOL;
+ $output_single .= "\t\t" . 'value.bind( function( to ) {' . PHP_EOL;
// CSS
if ( isset( $theme_option['preview_js']['css'] ) ) {
- $output_single .= "\t\t\t" . "var newCss = '';" . "\r\n\r\n";
- $output_single .= "\t\t\t" . "if ( jQuery( '#jscss-" . $theme_option['id'] . "' ).length ) { jQuery( '#jscss-" . $theme_option['id'] . "' ).remove() }" . "\r\n\r\n";
+ $output_single .= "\t\t\t" . "var newCss = '';" . PHP_EOL.PHP_EOL;
+ $output_single .= "\t\t\t" . "if ( jQuery( '#jscss-" . $theme_option['id'] . "' ).length ) { jQuery( '#jscss-" . $theme_option['id'] . "' ).remove() }" . PHP_EOL.PHP_EOL;
foreach ( $theme_option['preview_js']['css'] as $selector => $properties ) {
-
if ( is_array( $properties ) ) {
$output_single_css = $selector_before = $selector_after = '';
@@ -272,12 +278,12 @@ public static function preview_scripts() {
}
$property = wp_parse_args( (array) $property, array(
- 'custom' => '',
- 'prefix' => '',
- 'process_callback' => '',
- 'property' => '',
- 'suffix' => '',
- ) );
+ 'custom' => '',
+ 'prefix' => '',
+ 'process_callback' => '',
+ 'property' => '',
+ 'suffix' => '',
+ ) );
$value = ( empty( $property['process_callback'] ) ) ? ( 'to' ) : ( trim( $property['process_callback'] ) . '( to )' );
@@ -287,42 +293,39 @@ public static function preview_scripts() {
$output_single_css .= $property['property'] . ": " . str_replace( '[[value]]', "' + " . $value . " + '", $property['custom'] ) . "; ";
}
- } // /foreach
+ }
- $output_single .= "\t\t\t" . "newCss += '" . $selector_before . $selector . " { " . $output_single_css . "}" . $selector_after . " ';" . "\r\n";
+ $output_single .= "\t\t\t" . "newCss += '" . $selector_before . $selector . " { " . $output_single_css . "}" . $selector_after . " ';" . PHP_EOL;
}
+ }
- } // /foreach
-
- $output_single .= "\r\n\t\t\t" . "jQuery( document ).find( 'head' ).append( jQuery( '' ) );" . "\r\n";
+ $output_single .= PHP_EOL . "\t\t\t" . "jQuery( document ).find( 'head' ).append( jQuery( '' ) );" . PHP_EOL;
}
// Custom JS
if ( isset( $theme_option['preview_js']['custom'] ) ) {
- $output_single .= "\t\t" . $theme_option['preview_js']['custom'] . "\r\n";
+ $output_single .= "\t\t" . $theme_option['preview_js']['custom'] . PHP_EOL;
}
- $output_single .= "\t\t" . '} );' . "\r\n";
- $output_single .= "\t" . '}'. "\r\n";
- $output_single .= ');'. "\r\n";
- $output_single = apply_filters( 'wmhook_modern_library_customize_preview_scripts_option_' . $theme_option['id'], $output_single );
+ $output_single .= "\t\t" . '} );' . PHP_EOL;
+ $output_single .= "\t" . '}'. PHP_EOL;
+ $output_single .= ');'. PHP_EOL;
+ $output_single = (string) apply_filters( 'wmhook_modern_library_customize_preview_scripts_option_' . $theme_option['id'], $output_single );
$output .= $output_single;
}
-
- } // /foreach
-
+ }
}
// Output
if ( $output = trim( $output ) ) {
- echo apply_filters( 'wmhook_modern_library_customize_preview_scripts_output', '' . "\r\n" . '' );
+ echo (string) apply_filters( 'wmhook_modern_library_customize_preview_scripts_output', '' . PHP_EOL . '' );
}
} // /preview_scripts
@@ -340,8 +343,10 @@ public static function preview_scripts() {
*
* @uses `wmhook_modern_theme_options` global hook
*
+ * @subpackage Customize Options
+ *
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*
* @param object $wp_customize WP customizer object.
*/
@@ -356,9 +361,9 @@ public static function customize( $wp_customize ) {
// Pre
- $pre = apply_filters( 'wmhook_modern_library_customize_pre', false, $wp_customize );
+ $pre = apply_filters( 'wmhook_modern_library_customize_pre', null, $wp_customize );
- if ( false !== $pre ) {
+ if ( null !== $pre ) {
return $pre;
}
@@ -369,25 +374,25 @@ public static function customize( $wp_customize ) {
ksort( $theme_options );
- $allowed_option_types = apply_filters( 'wmhook_modern_library_customize_allowed_option_types', array(
- 'checkbox',
- 'color',
- 'email',
- 'hidden',
- 'html',
- 'image',
- 'multicheckbox',
- 'multiselect',
- 'password',
- 'radio',
- 'radiomatrix',
- 'range',
- 'section',
- 'select',
- 'text',
- 'textarea',
- 'url',
- ) );
+ $allowed_option_types = (array) apply_filters( 'wmhook_modern_library_customize_allowed_option_types', array(
+ 'checkbox',
+ 'color',
+ 'email',
+ 'hidden',
+ 'html',
+ 'image',
+ 'multicheckbox',
+ 'multiselect',
+ 'password',
+ 'radio',
+ 'radiomatrix',
+ 'range',
+ 'section',
+ 'select',
+ 'text',
+ 'textarea',
+ 'url',
+ ) );
// To make sure our customizer sections start after WordPress default ones
@@ -448,10 +453,11 @@ public static function customize( $wp_customize ) {
// Generate customizer options
- if ( is_array( $theme_options ) && ! empty( $theme_options ) ) {
-
+ if (
+ is_array( $theme_options )
+ && ! empty( $theme_options )
+ ) {
foreach ( $theme_options as $theme_option ) {
-
if (
is_array( $theme_option )
&& isset( $theme_option['type'] )
@@ -474,6 +480,18 @@ public static function customize( $wp_customize ) {
$description = $theme_option['description'];
}
+ if ( isset( $theme_option['sanitize_callback'] ) ) {
+ $sanitize_callback = $theme_option['sanitize_callback'];
+ } else {
+ $sanitize_callback = '';
+ }
+
+ if ( isset( $theme_option['validate_callback'] ) ) {
+ $validate_callback = $theme_option['validate_callback'];
+ } else {
+ $validate_callback = '';
+ }
+
$transport = ( isset( $theme_option['preview_js'] ) ) ? ( 'postMessage' ) : ( 'refresh' );
@@ -495,35 +513,28 @@ public static function customize( $wp_customize ) {
$panel_type = 'theme-options';
if ( is_array( $theme_option['in_panel'] ) ) {
-
$panel_title = isset( $theme_option['in_panel']['title'] ) ? ( $theme_option['in_panel']['title'] ) : ( '—' );
$panel_id = isset( $theme_option['in_panel']['id'] ) ? ( $theme_option['in_panel']['id'] ) : ( $panel_type );
$panel_type = isset( $theme_option['in_panel']['type'] ) ? ( $theme_option['in_panel']['type'] ) : ( $panel_type );
-
} else {
-
$panel_title = $theme_option['in_panel'];
$panel_id = $panel_type;
-
}
- $panel_type = apply_filters( 'wmhook_modern_library_customize_panel_type', $panel_type, $theme_option, $theme_options );
- $panel_id = apply_filters( 'wmhook_modern_library_customize_panel_id', $panel_id, $theme_option, $theme_options );
+ $panel_type = (string) apply_filters( 'wmhook_modern_library_customize_panel_type', $panel_type, $theme_option, $theme_options );
+ $panel_id = (string) apply_filters( 'wmhook_modern_library_customize_panel_id', $panel_id, $theme_option, $theme_options );
if ( $customizer_panel !== $panel_id ) {
-
$wp_customize->add_panel(
- $panel_id,
- array(
- 'title' => esc_html( $panel_title ),
- 'description' => ( isset( $theme_option['in_panel-description'] ) ) ? ( $theme_option['in_panel-description'] ) : ( '' ), // Hidden at the top of the panel
- 'priority' => $priority,
- 'type' => $panel_type, // Sets also the panel class
- )
- );
-
+ $panel_id,
+ array(
+ 'title' => esc_html( $panel_title ),
+ 'description' => ( isset( $theme_option['in_panel-description'] ) ) ? ( $theme_option['in_panel-description'] ) : ( '' ), // Hidden at the top of the panel
+ 'priority' => $priority,
+ 'type' => $panel_type, // Sets also the panel class
+ )
+ );
$customizer_panel = $panel_id;
-
}
}
@@ -540,14 +551,14 @@ public static function customize( $wp_customize ) {
}
$customizer_section = array(
- 'id' => $option_id,
- 'setup' => array(
- 'title' => $theme_option['create_section'], // Section title
- 'description' => ( isset( $theme_option['create_section-description'] ) ) ? ( $theme_option['create_section-description'] ) : ( '' ), // Displayed at the top of section
- 'priority' => $priority,
- 'type' => 'theme-options', // Sets also the section class
- )
- );
+ 'id' => $option_id,
+ 'setup' => array(
+ 'title' => $theme_option['create_section'], // Section title
+ 'description' => ( isset( $theme_option['create_section-description'] ) ) ? ( $theme_option['create_section-description'] ) : ( '' ), // Displayed at the top of section
+ 'priority' => $priority,
+ 'type' => 'theme-options', // Sets also the section class
+ )
+ );
if ( ! isset( $theme_option['in_panel'] ) ) {
$customizer_panel = '';
@@ -556,9 +567,9 @@ public static function customize( $wp_customize ) {
}
$wp_customize->add_section(
- $customizer_section['id'],
- $customizer_section['setup']
- );
+ $customizer_section['id'],
+ $customizer_section['setup']
+ );
$customizer_section = $customizer_section['id'];
@@ -570,14 +581,14 @@ public static function customize( $wp_customize ) {
* Generic settings
*/
$generic = array(
- 'label' => ( isset( $theme_option['label'] ) ) ? ( $theme_option['label'] ) : ( '' ),
- 'description' => $description,
- 'section' => ( isset( $theme_option['section'] ) ) ? ( $theme_option['section'] ) : ( $customizer_section ),
- 'priority' => ( isset( $theme_option['priority'] ) ) ? ( $theme_option['priority'] ) : ( $priority ),
- 'type' => $theme_option['type'],
- 'active_callback' => ( isset( $theme_option['active_callback'] ) ) ? ( $theme_option['active_callback'] ) : ( null ),
- 'input_attrs' => ( isset( $theme_option['input_attrs'] ) ) ? ( $theme_option['input_attrs'] ) : ( array() ),
- );
+ 'label' => ( isset( $theme_option['label'] ) ) ? ( $theme_option['label'] ) : ( '' ),
+ 'description' => $description,
+ 'section' => ( isset( $theme_option['section'] ) ) ? ( $theme_option['section'] ) : ( $customizer_section ),
+ 'priority' => ( isset( $theme_option['priority'] ) ) ? ( $theme_option['priority'] ) : ( $priority ),
+ 'type' => $theme_option['type'],
+ 'active_callback' => ( isset( $theme_option['active_callback'] ) ) ? ( $theme_option['active_callback'] ) : ( '' ),
+ 'input_attrs' => ( isset( $theme_option['input_attrs'] ) ) ? ( $theme_option['input_attrs'] ) : ( array() ),
+ );
@@ -586,393 +597,429 @@ public static function customize( $wp_customize ) {
*/
switch ( $theme_option['type'] ) {
- /**
- * Checkbox, radio
- */
case 'checkbox':
case 'radio':
-
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( 'checkbox' === $theme_option['type'] ) ? ( 'Modern_Library_Sanitize::checkbox' ) : ( 'Modern_Library_Sanitize::select' ),
- 'sanitize_js_callback' => ( 'checkbox' === $theme_option['type'] ) ? ( 'Modern_Library_Sanitize::checkbox' ) : ( 'Modern_Library_Sanitize::select' ),
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( 'checkbox' === $theme_option['type'] ) ? ( 'Modern_Library_Sanitize::checkbox' ) : ( 'Modern_Library_Sanitize::select' ),
+ 'sanitize_js_callback' => ( 'checkbox' === $theme_option['type'] ) ? ( 'Modern_Library_Sanitize::checkbox' ) : ( 'Modern_Library_Sanitize::select' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control(
- $option_id,
- array_merge( $generic, array(
- 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
- ) )
- );
-
- break;
+ $option_id,
+ array_merge( $generic, array(
+ 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
+ ) )
+ );
+ break;
- /**
- * Checkboxex, multiselect
- */
case 'multicheckbox':
case 'multiselect':
-
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'Modern_Library_Sanitize::multi_array' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'Modern_Library_Sanitize::multi_array' ),
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'Modern_Library_Sanitize::multi_array' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'Modern_Library_Sanitize::multi_array' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control( new Modern_Customize_Control_Multiselect(
- $wp_customize,
- $option_id,
- array_merge( $generic, array(
- 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
- ) )
- ) );
-
- break;
-
- /**
- * Color
- */
- case 'color':
+ $wp_customize,
+ $option_id,
+ array_merge( $generic, array(
+ 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
+ ) )
+ ) );
+ break;
+ case 'color':
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => trim( $default, '#' ),
- 'transport' => $transport,
- 'sanitize_callback' => 'sanitize_hex_color_no_hash',
- 'sanitize_js_callback' => 'maybe_hash_hex_color',
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => trim( $default, '#' ),
+ 'transport' => $transport,
+ 'sanitize_callback' => 'sanitize_hex_color_no_hash',
+ 'sanitize_js_callback' => 'maybe_hash_hex_color',
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control( new WP_Customize_Color_Control(
- $wp_customize,
- $option_id,
- $generic
- ) );
+ $wp_customize,
+ $option_id,
+ $generic
+ ) );
+ break;
- break;
-
- /**
- * Email
- */
case 'email':
-
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => 'sanitize_email',
- 'sanitize_js_callback' => 'sanitize_email',
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => 'sanitize_email',
+ 'sanitize_js_callback' => 'sanitize_email',
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control(
- $option_id,
- $generic
- );
-
- break;
+ $option_id,
+ $generic
+ );
+ break;
- /**
- * Hidden
- */
case 'hidden':
-
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_attr' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_attr' ),
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_attr' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_attr' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control( new Modern_Customize_Control_Hidden(
- $wp_customize,
- $option_id,
- array(
- 'label' => 'HIDDEN FIELD',
- 'section' => $customizer_section,
- 'priority' => $priority,
- )
- ) );
-
- break;
-
- /**
- * HTML
- */
- case 'html':
+ $wp_customize,
+ $option_id,
+ array(
+ 'label' => 'HIDDEN FIELD',
+ 'section' => $customizer_section,
+ 'priority' => $priority,
+ )
+ ) );
+ break;
+ case 'html':
if ( empty( $option_id ) ) {
$option_id = 'custom-title-' . $priority;
}
-
$wp_customize->add_setting(
- $option_id,
- array(
- 'sanitize_callback' => 'wp_kses_post',
- 'sanitize_js_callback' => 'wp_filter_post_kses',
- )
- );
-
+ $option_id,
+ array(
+ 'sanitize_callback' => 'wp_kses_post',
+ 'sanitize_js_callback' => 'wp_filter_post_kses',
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control( new Modern_Customize_Control_HTML(
- $wp_customize,
- $option_id,
- array(
- 'label' => ( isset( $theme_option['label'] ) ) ? ( $theme_option['label'] ) : ( '' ),
- 'description' => $description,
- 'content' => $theme_option['content'],
- 'section' => ( isset( $theme_option['section'] ) ) ? ( $theme_option['section'] ) : ( $customizer_section ),
- 'priority' => ( isset( $theme_option['priority'] ) ) ? ( $theme_option['priority'] ) : ( $priority ),
- 'active_callback' => ( isset( $theme_option['active_callback'] ) ) ? ( $theme_option['active_callback'] ) : ( null ),
- )
- ) );
-
- break;
-
- /**
- * Image
- */
- case 'image':
+ $wp_customize,
+ $option_id,
+ array_merge( $generic, array(
+ 'content' => $theme_option['content'],
+ ) )
+ ) );
+ break;
+ case 'image':
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_url_raw' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_url_raw' ),
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_url_raw' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_url_raw' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control( new WP_Customize_Image_Control(
- $wp_customize,
- $option_id,
- array_merge( $generic, array(
- 'context' => $option_id,
- ) )
- ) );
-
- break;
-
- /**
- * Range
- */
- case 'range':
+ $wp_customize,
+ $option_id,
+ array_merge( $generic, array(
+ 'context' => $option_id,
+ ) )
+ ) );
+ break;
+ case 'range':
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'absint' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'absint' ),
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'absint' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'absint' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control(
- $option_id,
- array_merge( $generic, array(
- 'input_attrs' => array(
- 'min' => $theme_option['min'],
- 'max' => $theme_option['max'],
- 'step' => $theme_option['step'],
- 'data-multiply' => ( isset( $theme_option['multiplier'] ) ) ? ( $theme_option['multiplier'] ) : ( 1 ),
- 'data-prefix' => ( isset( $theme_option['prefix'] ) ) ? ( $theme_option['prefix'] ) : ( '' ),
- 'data-suffix' => ( isset( $theme_option['suffix'] ) ) ? ( $theme_option['suffix'] ) : ( '' ),
- 'data-decimals' => ( isset( $theme_option['decimal_places'] ) ) ? ( absint( $theme_option['decimal_places'] ) ) : ( 0 ),
- ),
- ) )
- );
-
- break;
-
- /**
- * Password
- */
- case 'password':
+ $option_id,
+ array_merge( $generic, array(
+ 'input_attrs' => array(
+ 'min' => $theme_option['min'],
+ 'max' => $theme_option['max'],
+ 'step' => $theme_option['step'],
+ 'data-multiply' => ( isset( $theme_option['multiplier'] ) ) ? ( $theme_option['multiplier'] ) : ( 1 ),
+ 'data-prefix' => ( isset( $theme_option['prefix'] ) ) ? ( $theme_option['prefix'] ) : ( '' ),
+ 'data-suffix' => ( isset( $theme_option['suffix'] ) ) ? ( $theme_option['suffix'] ) : ( '' ),
+ 'data-decimals' => ( isset( $theme_option['decimal_places'] ) ) ? ( absint( $theme_option['decimal_places'] ) ) : ( 0 ),
+ ),
+ ) )
+ );
+ break;
+ case 'password':
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_attr' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_attr' ),
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_attr' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_attr' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control(
- $option_id,
- $generic
- );
-
- break;
+ $option_id,
+ $generic
+ );
+ break;
- /**
- * Radio matrix
- */
case 'radiomatrix':
-
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_attr' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_attr' ),
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_attr' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_attr' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control( new Modern_Customize_Control_Radio_Matrix(
- $wp_customize,
- $option_id,
- array_merge( $generic, array(
- 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
- 'class' => ( isset( $theme_option['class'] ) ) ? ( $theme_option['class'] ) : ( '' ),
- ) )
- ) );
-
- break;
-
- /**
- * Select (with optgroups)
- */
- case 'select':
+ $wp_customize,
+ $option_id,
+ array_merge( $generic, array(
+ 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
+ 'class' => ( isset( $theme_option['class'] ) ) ? ( $theme_option['class'] ) : ( '' ),
+ ) )
+ ) );
+ break;
+ case 'select':
+ // Supporting optgroups too.
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => 'Modern_Library_Sanitize::select',
- 'sanitize_js_callback' => 'Modern_Library_Sanitize::select',
- )
- );
-
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => 'Modern_Library_Sanitize::select',
+ 'sanitize_js_callback' => 'Modern_Library_Sanitize::select',
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control( new Modern_Customize_Control_Select(
- $wp_customize,
- $option_id,
- array_merge( $generic, array(
- 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
- ) )
- ) );
-
- break;
-
- /**
- * Text
- */
+ $wp_customize,
+ $option_id,
+ array_merge( $generic, array(
+ 'choices' => ( isset( $theme_option['choices'] ) ) ? ( $theme_option['choices'] ) : ( '' ),
+ ) )
+ ) );
+ break;
+
case 'text':
+ $wp_customize->add_setting(
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_textarea' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_textarea' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
+ $wp_customize->add_control(
+ $option_id,
+ $generic
+ );
+ break;
+ case 'textarea':
$wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_textarea' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_textarea' ),
- )
- );
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_textarea' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_textarea' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
+ $wp_customize->add_control(
+ $option_id,
+ $generic
+ );
+ break;
+ case 'url':
+ $wp_customize->add_setting(
+ $option_id,
+ array(
+ 'type' => $type,
+ 'default' => $default,
+ 'transport' => $transport,
+ 'sanitize_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_url' ),
+ 'sanitize_js_callback' => ( $sanitize_callback ) ? ( $sanitize_callback ) : ( 'esc_url' ),
+ 'validate_callback' => $validate_callback,
+ )
+ );
$wp_customize->add_control(
- $option_id,
- $generic
- );
+ $option_id,
+ $generic
+ );
+ break;
- break;
+ default:
+ break;
- /**
- * Textarea
- */
- case 'textarea':
+ }
- $wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_textarea' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_textarea' ),
- )
- );
+ }
+ }
+ }
- $wp_customize->add_control(
- $option_id,
- $generic
- );
+ // Assets needed for customizer preview
- break;
+ if ( $wp_customize->is_preview() ) {
+ add_action( 'wp_footer', __CLASS__ . '::preview_scripts', 99 );
+ }
- /**
- * URL
- */
- case 'url':
+ } // /customize
- $wp_customize->add_setting(
- $option_id,
- array(
- 'type' => $type,
- 'default' => $default,
- 'transport' => $transport,
- 'sanitize_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_url' ),
- 'sanitize_js_callback' => ( isset( $theme_option['validate'] ) ) ? ( $theme_option['validate'] ) : ( 'esc_url' ),
- )
- );
- $wp_customize->add_control(
- $option_id,
- $generic
- );
- break;
- /**
- * Default
- */
- default:
- break;
- } // /switch
+ /**
+ * 30) Getters
+ */
+
+ /**
+ * Get theme mod or fall back to default automatically
+ *
+ * @uses `wmhook_modern_theme_options` global hook
+ * @link https://developer.wordpress.org/reference/functions/get_theme_mod/
+ *
+ * @subpackage Customize Options
+ *
+ * @since 2.7.0
+ * @version 2.7.0
+ *
+ * @param string $name
+ * @param array $theme_option_setup
+ */
+ public static function get_theme_mod( $name, $theme_option_setup = array() ) {
+
+ // Pre
- } // /if suitable option array
+ $pre = apply_filters( 'wmhook_modern_library_customize_get_theme_mod_pre', null, $name, $theme_option_setup );
- } // /foreach
+ if ( null !== $pre ) {
+ return $pre;
+ }
- } // /if skin options are non-empty array
- // Assets needed for customizer preview
+ // Helper variables
- if ( $wp_customize->is_preview() ) {
+ $output = false;
- add_action( 'wp_footer', __CLASS__ . '::preview_scripts', 99 );
+ if ( false === self::$mods ) {
+ // Cache theme mods
+ self::$mods = get_theme_mods();
+ }
+
+
+ // Processing
+
+ if ( isset( self::$mods[ $name ] ) ) {
+
+ /**
+ * Theme option has been modified,
+ * so we don't need the default value.
+ */
+ $output = self::$mods[ $name ];
+
+ } else {
+
+ /**
+ * We haven't found a modified theme option,
+ * so we need its default value.
+ */
+ if ( empty( $theme_option_setup ) ) {
+
+ /**
+ * We don't have single theme option passed,
+ * get all theme options setup.
+ */
+ if ( false === self::$theme_options_setup ) {
+ // Cache theme options setup
+ self::$theme_options_setup = (array) apply_filters( 'wmhook_modern_theme_options', array() );
+ }
+
+ foreach ( self::$theme_options_setup as $option ) {
+ if (
+ isset( $option['default'] )
+ && isset( $option['id'] )
+ && $name === $option['id']
+ ) {
+ $output = $option['default'];
+ $theme_option_setup = $option;
+ break;
+ }
+ }
+
+ } else {
+
+ /**
+ * We have single theme option passed,
+ * get the default value from it.
+ */
+ if (
+ isset( $theme_option_setup['default'] )
+ && isset( $theme_option_setup['id'] )
+ && $name === $theme_option_setup['id']
+ ) {
+ $output = $theme_option_setup['default'];
+ }
}
- } // /customize
+ /**
+ * @see https://developer.wordpress.org/reference/functions/get_theme_mod/
+ */
+ if ( is_string( $output ) ) {
+ $output = sprintf(
+ $output,
+ get_template_directory_uri(),
+ get_stylesheet_directory_uri()
+ );
+ }
+
+ }
+
+
+ // Output
+
+ return apply_filters( 'theme_mod_' . $name, $output, $theme_option_setup );
+
+ } // /get_theme_mod
diff --git a/library/includes/classes/class-sanitize.php b/library/includes/classes/class-sanitize.php
index 1630ff0..4e81442 100644
--- a/library/includes/classes/class-sanitize.php
+++ b/library/includes/classes/class-sanitize.php
@@ -4,11 +4,13 @@
*
* @link https://github.com/WPTRT/code-examples/blob/master/customizer/sanitization-callbacks.php
*
- * @package WebMan WordPress Theme Framework
* @subpackage Core
*
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ *
* @since 2.5.0
- * @version 2.5.6
+ * @version 2.7.0
*
* Contents:
*
@@ -90,7 +92,7 @@ public static function select( $value, $choices = array(), $default = '' ) {
* Returns an array of values.
*
* @since 2.5.0
- * @version 2.5.4
+ * @version 2.6.1
*
* @param mixed $value
* @param array $choices
@@ -132,7 +134,7 @@ public static function multi_array( $value, $choices = array() ) {
$value[ $key ] = esc_attr( $single_value );
- } // /foreach
+ }
// Output
diff --git a/library/includes/classes/class-visual-editor.php b/library/includes/classes/class-visual-editor.php
index 753ee9c..89eebc2 100644
--- a/library/includes/classes/class-visual-editor.php
+++ b/library/includes/classes/class-visual-editor.php
@@ -5,11 +5,13 @@
* This is a helper class and does not load automatically with the library.
* Load it directly from within your theme's `functions.php` file.
*
- * @package WebMan WordPress Theme Framework
* @subpackage Visual Editor
*
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ *
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*
* Contents:
*
@@ -36,7 +38,7 @@ final class Modern_Library_Visual_Editor {
* Constructor
*
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*/
private function __construct() {
@@ -44,14 +46,6 @@ private function __construct() {
// Hooks
- // Actions
-
- // Editor body class on page template change
-
- if ( is_admin() ) {
- add_action( 'admin_enqueue_scripts', __CLASS__ . '::scripts_post_edit', 1000 );
- }
-
// Filters
// Editor body class
@@ -62,8 +56,7 @@ private function __construct() {
// Editor addons
- add_filter( 'mce_buttons', __CLASS__ . '::add_buttons_row1' );
-
+ add_filter( 'mce_buttons', __CLASS__ . '::add_buttons_row1' );
add_filter( 'mce_buttons_2', __CLASS__ . '::add_buttons_row2' );
add_filter( 'tiny_mce_before_init', __CLASS__ . '::style_formats' );
@@ -107,21 +100,12 @@ public static function init() {
* First row.
*
* @since 1.0.0
- * @version 2.0.0
+ * @version 2.7.0
*
* @param array $buttons
*/
public static function add_buttons_row1( $buttons ) {
- // Pre
-
- $pre = apply_filters( 'wmhook_modern_library_editor_add_buttons_row1_pre', false, $buttons );
-
- if ( false !== $pre ) {
- return $pre;
- }
-
-
// Processing
// Inserting buttons after "more" button
@@ -149,21 +133,12 @@ public static function add_buttons_row1( $buttons ) {
* Second row.
*
* @since 1.0.0
- * @version 2.0.0
+ * @version 2.7.0
*
* @param array $buttons
*/
public static function add_buttons_row2( $buttons ) {
- // Pre
-
- $pre = apply_filters( 'wmhook_modern_library_editor_add_buttons_row2_pre', false, $buttons );
-
- if ( false !== $pre ) {
- return $pre;
- }
-
-
// Processing
// Inserting buttons at the beginning of the row
@@ -192,21 +167,12 @@ public static function add_buttons_row2( $buttons ) {
* @link http://www.tinymce.com/wiki.php/Configuration:style_formats
*
* @since 1.0.0
- * @version 2.6.0
+ * @version 2.7.0
*
* @param array $init
*/
public static function style_formats( $init ) {
- // Pre
-
- $pre = apply_filters( 'wmhook_modern_library_editor_style_formats_pre', false, $init );
-
- if ( false !== $pre ) {
- return $pre;
- }
-
-
// Processing
// Add custom formats
@@ -392,7 +358,7 @@ public static function style_formats( $init ) {
* Adding editor HTML body classes
*
* @since 1.7.2
- * @version 2.0.1
+ * @version 2.7.0
*
* @param array $init
*/
@@ -422,17 +388,6 @@ public static function body_class( $init ) {
$class[] = 'entry-content';
- // Page template class
-
- if ( version_compare( $wp_version, '4.7', '<' ) ) {
-
- if ( $page_template = get_page_template_slug( $post ) ) {
- $page_template = str_replace( '.', '-', basename( $page_template, '.php' ) );
- $class[] = 'page-template-' . sanitize_html_class( $page_template );
- }
-
- }
-
// Adding custom classes
$init['body_class'] = $init['body_class'] . ' ' . implode( ' ', $class );
@@ -446,49 +401,6 @@ public static function body_class( $init ) {
- /**
- * Adding scripts to post edit screen
- *
- * @since 1.7.2
- * @version 2.6.0
- *
- * @param string $hook_suffix
- */
- public static function scripts_post_edit( $hook_suffix = '' ) {
-
- // Helper variables
-
- global $wp_version;
-
- $current_screen = get_current_screen();
-
-
- // Requirements check
-
- if (
- version_compare( $wp_version, '4.7', '>=' )
- || ( isset( $current_screen->base ) && 'post' != $current_screen->base )
- ) {
- return;
- }
-
-
- // Processing
-
- // Scripts
-
- wp_enqueue_script(
- 'modern-post-edit',
- get_theme_file_uri( MODERN_LIBRARY_DIR . 'js/post.js' ),
- array( 'jquery' ),
- esc_attr( MODERN_THEME_VERSION ),
- true
- );
-
- } // /scripts_post_edit
-
-
-
} // /Modern_Library_Visual_Editor
diff --git a/library/includes/vendor/tgmpa/class-tgm-plugin-activation.php b/library/includes/vendor/tgmpa/class-tgm-plugin-activation.php
index baa621f..361956e 100644
--- a/library/includes/vendor/tgmpa/class-tgm-plugin-activation.php
+++ b/library/includes/vendor/tgmpa/class-tgm-plugin-activation.php
@@ -7,11 +7,13 @@
* Modification:
* - Changed localization text domain
*
- * @package WebMan WordPress Theme Framework
* @subpackage Plugins
*
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ *
* @since 1.0.0
- * @version 2.4.4
+ * @version 2.7.0
*/
diff --git a/library/includes/vendor/use-child-theme/class-use-child-theme.php b/library/includes/vendor/use-child-theme/class-use-child-theme.php
index 44d1729..d87318a 100644
--- a/library/includes/vendor/use-child-theme/class-use-child-theme.php
+++ b/library/includes/vendor/use-child-theme/class-use-child-theme.php
@@ -2,11 +2,13 @@
/**
* WebMan Design Use Child Theme
*
- * @package WebMan WordPress Theme Framework
- * @subpackage Plugins
+ * @subpackage Child Theme
+ *
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
*
* @since 1.6.2
- * @version 2.2.6
+ * @version 2.7.0
*/
@@ -19,10 +21,9 @@
* @link https://github.com/webmandesign/use-child-theme
* @link https://github.com/FacetWP/use-child-theme
*
- * This is a fork of Use Child Theme by FacetWP modified for use
- * in WebMan WordPress Theme Framework.
- *
- * This does not work in WordPress multisite installation due to theme
+ * This is a fork of Use Child Theme by FacetWP (version 0.4)
+ * modified for use in WebMan WordPress Theme Framework.
+ * Does not work in WordPress multisite installation due to theme
* file editor not being available in single site dashboard.
*
* Modifications:
@@ -35,15 +36,7 @@
* Used development variables/prefixes:
* - text_domain
*
- * @version 1.2.1
- */
-
-
-
-/**
- * Use Child Theme
- * A drop-in to make it easy to use WordPress child themes
- * @version 0.4
+ * @version 1.3.0
*/
defined( 'ABSPATH' ) or exit;
@@ -63,6 +56,9 @@ class Use_Child_Theme {
+ /**
+ * @version 1.0.0
+ */
function __construct() {
add_action( 'admin_init', array( $this, 'admin_init' ) );
@@ -71,6 +67,9 @@ function __construct() {
+ /**
+ * @version 1.3.0
+ */
function admin_init() {
// Exit if unauthorized
@@ -96,13 +95,16 @@ function admin_init() {
}
add_action( 'wp_ajax_uct_activate', array( $this, 'activate_child_theme' ) );
- add_action( 'wp_ajax_uct_dismiss', array( $this, 'dismiss_notice' ) );
- add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+ add_action( 'wp_ajax_uct_dismiss', array( $this, 'dismiss_notice' ) );
+ add_action( 'admin_notices', array( $this, 'admin_notices' ) );
} // /admin_init
+ /**
+ * @version 1.3.0
+ */
function admin_notices() {
// Show only on specific admin page(s) (default: Appearance > Editor)
@@ -115,19 +117,32 @@ function admin_notices() {
?>
@@ -143,6 +158,9 @@ function admin_notices() {
+ /**
+ * @version 1.0.0
+ */
function dismiss_notice() {
set_transient( 'uct_dismiss_notice', 'yes', apply_filters( 'uct_dismiss_timeout', 86400 ) );
@@ -152,10 +170,13 @@ function dismiss_notice() {
+ /**
+ * @version 1.3.0
+ */
function has_child_theme() {
- $themes = wp_get_themes();
- $folder_name = $this->theme->get_stylesheet();
+ $themes = wp_get_themes();
+ $folder_name = $this->theme->get_stylesheet();
$this->child_slug = $folder_name . '-child';
foreach ( $themes as $theme ) {
@@ -171,6 +192,9 @@ function has_child_theme() {
+ /**
+ * @version 1.0.0
+ */
function activate_child_theme() {
$parent_slug = $this->theme->get_stylesheet();
@@ -196,13 +220,18 @@ function activate_child_theme() {
+ /**
+ * @version 1.3.0
+ */
function create_child_theme() {
$parent_dir = $this->theme->get_stylesheet_directory();
- $child_dir = $parent_dir . '-child';
+ $child_dir = $parent_dir . '-child';
if ( wp_mkdir_p( $child_dir ) ) {
+
$creds = request_filesystem_credentials( admin_url() );
+
WP_Filesystem( $creds ); // we already have direct access
global $wp_filesystem;
@@ -212,24 +241,32 @@ function create_child_theme() {
if ( false !== ( $img = $this->theme->get_screenshot( 'relative' ) ) ) {
$wp_filesystem->copy( "$parent_dir/$img", "$child_dir/$img" );
}
+
} else {
+
wp_die( esc_html__( 'Error: theme folder not writable!', 'modern' ) );
+
}
} // /create_child_theme
+ /**
+ * @version 1.3.0
+ */
function style_css() {
- $output = '/**' . "\r\n";
- $output .= ' * Theme Name: ' . $this->theme->get( 'Name' ) . ' Child' . "\r\n";
- $output .= ' * Template: ' . $this->theme->get_stylesheet() . "\r\n";
- $output .= ' * Version: 1.0.0' . "\r\n";
- $output .= ' * Description: This is a child theme of ' . $this->theme->get( 'Name' ) . "\r\n";
- $output .= ' */' . "\r\n";
- $output .= "\r\n";
- $output .= '/* Put your custom CSS styles below... */' . "\r\n";
+ $output = '/*!' . PHP_EOL;
+ $output .= 'Theme Name: ' . $this->theme->get( 'Name' ) . ' Child' . PHP_EOL;
+ $output .= 'Template: ' . $this->theme->get_stylesheet() . PHP_EOL;
+ $output .= 'Version: 1.0.0' . PHP_EOL;
+ $output .= 'Description: This is a child theme of ' . $this->theme->get( 'Name' ) . PHP_EOL;
+ $output .= 'License: GNU General Public License v3' . PHP_EOL;
+ $output .= 'License URI: http://www.gnu.org/licenses/gpl-3.0.html' . PHP_EOL;
+ $output .= '*/' . PHP_EOL;
+ $output .= PHP_EOL;
+ $output .= '/* Put your custom CSS styles here... */' . PHP_EOL;
return apply_filters( 'uct_style_css', $output );
@@ -237,27 +274,52 @@ function style_css() {
+ /**
+ * @version 1.3.0
+ */
function functions_php() {
- $output = 'theme->get( 'Name' ) . ' Child' . "\r\n";
- $output .= ' */' . "\r\n";
- $output .= "\r\n";
- $output .= '/**' . "\r\n";
- $output .= ' * Enqueue parent theme stylesheet the right way' . "\r\n";
- $output .= ' */' . "\r\n";
- $output .= 'function child_theme_enqueue_parent_styles() {' . "\r\n";
- $output .= "\t" . "if ( current_theme_supports( 'child-theme-stylesheet' ) ) { return; }" . "\r\n";
- $output .= "\t" . "wp_enqueue_style( 'parent-theme-styles', get_template_directory_uri() . '/style.css' );" . "\r\n";
- $output .= "\t" . "wp_enqueue_style( 'child-theme-styles', get_stylesheet_uri() );" . "\r\n";
- $output .= '}' . "\r\n";
- $output .= "\r\n";
- $output .= "add_action( 'wp_enqueue_scripts', 'child_theme_enqueue_parent_styles', 1000 );\r\n";
- $output .= "\r\n";
- $output .= '/* Put your custom PHP code below... */' . "\r\n";
+ $function_prefix = str_replace( '-', '_', $this->child_slug );
+
+ $output = 'theme->get( 'Name' ) . ' Child' . PHP_EOL;
+ $output .= ' *' . PHP_EOL;
+ $output .= ' * @version 1.0.0' . PHP_EOL;
+ $output .= ' */' . PHP_EOL;
+
+ $output .= PHP_EOL.PHP_EOL.PHP_EOL.PHP_EOL.PHP_EOL;
+
+ $output .= '/**' . PHP_EOL;
+ $output .= ' * Enqueue parent theme stylesheet' . PHP_EOL;
+ $output .= ' *' . PHP_EOL;
+ $output .= ' * This runs only if parent theme does not claim support for' . PHP_EOL;
+ $output .= ' * `child-theme-stylesheet`, and so we need to enqueue this' . PHP_EOL;
+ $output .= ' * child theme `style.css` file ourselves.' . PHP_EOL;
+ $output .= ' *' . PHP_EOL;
+ $output .= ' * If parent theme supports `child-theme-stylesheet`, it enqueues' . PHP_EOL;
+ $output .= ' * this child theme `style.css` file automatically.' . PHP_EOL;
+ $output .= ' *' . PHP_EOL;
+ $output .= ' * @version 1.0.0' . PHP_EOL;
+ $output .= ' */' . PHP_EOL;
+ $output .= 'function ' . $function_prefix . '_parent_theme_style() {' . PHP_EOL;
+ $output .= "\t" . "if ( ! current_theme_supports( 'child-theme-stylesheet' ) ) {" . PHP_EOL;
+ $output .= "\t\t" . "wp_enqueue_style( '" . $function_prefix . "-parent-style', get_template_directory_uri() . '/style.css' );" . PHP_EOL;
+ $output .= "\t\t" . "wp_enqueue_style( '" . $function_prefix . "-child-style', get_stylesheet_uri() );" . PHP_EOL;
+ $output .= "\t" . "}" . PHP_EOL;
+ $output .= '} // /' . $function_prefix . '_parent_theme_style' . PHP_EOL;
+ $output .= PHP_EOL;
+ $output .= "add_action( 'wp_enqueue_scripts', '" . $function_prefix . "_parent_theme_style', 1000 );" . PHP_EOL;
+
+ $output .= PHP_EOL.PHP_EOL.PHP_EOL.PHP_EOL.PHP_EOL;
+
+ $output .= '/**' . PHP_EOL;
+ $output .= ' * Put your custom PHP code below...' . PHP_EOL;
+ $output .= ' */' . PHP_EOL;
+
+ $output .= PHP_EOL;
return apply_filters( 'uct_functions_php', $output );
diff --git a/library/init.php b/library/init.php
index c7d0adb..6a0626b 100644
--- a/library/init.php
+++ b/library/init.php
@@ -6,22 +6,13 @@
* setup related options and can not be edited via customizer.
* This way we prevent creating additional options in the database.
*
- * @copyright WebMan Design, Oliver Juhas
- * @license GPL-3.0, http://www.gnu.org/licenses/gpl-3.0.html
- *
* @link https://github.com/webmandesign/webman-theme-framework
* @link http://www.webmandesign.eu
*
- * @package WebMan WordPress Theme Framework
- * @subpackage Core
- *
- * @version 2.6.0
- *
- * Used global hooks:
- *
- * @uses wmhook_modern_theme_options
- * @uses wmhook_modern_esc_css
- * @uses wmhook_modern_custom_styles
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ * @license GPL-3.0, http://www.gnu.org/licenses/gpl-3.0.html
+ * @version 2.7.0
*
* Used development prefixes:
*
@@ -106,7 +97,7 @@
// Plugins suggestions
if (
- apply_filters( 'wmhook_modern_plugins_suggestion_enabled', true )
+ (bool) apply_filters( 'wmhook_modern_plugins_suggestion_enabled', true )
&& locate_template( 'includes/tgmpa/plugins.php' )
) {
require MODERN_LIBRARY . 'includes/vendor/tgmpa/class-tgm-plugin-activation.php';
@@ -115,7 +106,7 @@
// Child theme generator
- if ( apply_filters( 'wmhook_modern_child_theme_generator_enabled', false ) ) {
+ if ( (bool) apply_filters( 'wmhook_modern_child_theme_generator_enabled', false ) ) {
require MODERN_LIBRARY . 'includes/vendor/use-child-theme/class-use-child-theme.php';
}
diff --git a/library/js/customize-control-multicheckbox.js b/library/js/customize-control-multicheckbox.js
index b3bbb74..473ef24 100644
--- a/library/js/customize-control-multicheckbox.js
+++ b/library/js/customize-control-multicheckbox.js
@@ -3,11 +3,13 @@
*
* Customizer multiple checkboxes.
*
- * @package WebMan WordPress Theme Framework
* @subpackage Customize
*
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ *
* @since 2.1.0
- * @version 2.2.0
+ * @version 2.7.0
*/
( function( exports, $ ) {
$( wp.customize ).on( 'ready', function() {
diff --git a/library/js/customize-control-radio-matrix.js b/library/js/customize-control-radio-matrix.js
index f2aa343..f5136a0 100644
--- a/library/js/customize-control-radio-matrix.js
+++ b/library/js/customize-control-radio-matrix.js
@@ -3,11 +3,13 @@
*
* Customizer matrix radio fields.
*
- * @package WebMan WordPress Theme Framework
* @subpackage Customize
*
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ *
* @since 1.0.0
- * @version 2.2.0
+ * @version 2.7.0
*/
( function( exports, $ ) {
$( wp.customize ).on( 'ready', function() {
diff --git a/library/js/customize-controls.js b/library/js/customize-controls.js
index b81647d..d6cc10a 100644
--- a/library/js/customize-controls.js
+++ b/library/js/customize-controls.js
@@ -6,11 +6,13 @@
* we conditionally hide corresponding "_attachment", "_position",
* "_repeat", "_size" and also "_opacity" controls.
*
- * @package WebMan WordPress Theme Framework
* @subpackage Customize
*
+ * @package WebMan WordPress Theme Framework
+ * @copyright WebMan Design, Oliver Juhas
+ *
* @since 2.2.0
- * @version 2.2.3
+ * @version 2.7.0
*/
( function( exports, $ ) {
$( wp.customize ).on( 'ready', function() {
@@ -95,32 +97,38 @@
$.each( backgroundImages, function( i, settingId ) {
wp.customize( settingId, function( value ) {
- var
- selectors = [
- '[id$="' + settingId + '_attachment"]',
- '[id$="' + settingId + '_opacity"]',
- '[id$="' + settingId + '_position"]',
- '[id$="' + settingId + '_repeat"]',
- '[id$="' + settingId + '_size"]',
- ];
-
- if ( ! _wpCustomizeSettings.settings[ settingId ].value ) {
- $( selectors.join() )
- .hide();
- }
+ // Helper variables
+
+ var
+ selectors = [
+ '[id$="' + settingId + '_attachment"]',
+ '[id$="' + settingId + '_opacity"]',
+ '[id$="' + settingId + '_position"]',
+ '[id$="' + settingId + '_repeat"]',
+ '[id$="' + settingId + '_size"]',
+ ];
+
+
+ // Processing
+
+ if ( ! _wpCustomizeSettings.settings[ settingId ].value ) {
+ $( selectors.join() )
+ .hide();
+ }
+
+ value
+ .bind( function( to ) {
- value
- .bind( function( to ) {
+ if ( ! to ) {
+ $( selectors.join() )
+ .hide();
+ } else {
+ $( selectors.join() )
+ .show();
+ }
- if ( ! to ) {
- $( selectors.join() )
- .hide();
- } else {
- $( selectors.join() )
- .show();
- }
+ } );
- } );
} );
} );
diff --git a/library/js/post.js b/library/js/post.js
deleted file mode 100644
index 2116896..0000000
--- a/library/js/post.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Post edit scripts
- *
- * @see wp-admin/js/post.js
- *
- * @package WebMan WordPress Theme Framework
- * @subpackage Visual Editor
- *
- * @since 1.7.2
- * @version 2.0.1
- */
-
-
-
-
-
-jQuery( document ).ready( function( $ ) {
-
-
-
-
-
- /**
- * Adding page template class on TinyMCE editor HTML body
- *
- * @since 1.7.2
- * @version 2.0.1
- */
- if ( typeof tinymce !== 'undefined' ) {
-
- $( '#page_template' )
- .on( 'change.set-editor-class', function() {
-
- // Helper variables
-
- var
- editor,
- body,
- pageTemplate = $( this ).val() || '';
-
- pageTemplate = pageTemplate.substr( pageTemplate.lastIndexOf( '/' ) + 1, pageTemplate.length )
- .replace( /\.php$/, '' )
- .replace( /\./g, '-' );
-
-
- // Processing
-
- if ( pageTemplate && ( editor = tinymce.get( 'content' ) ) ) {
- body = editor.getBody();
- body.className = body.className.replace( /\bpage-template-[^ ]+/, '' );
- editor.dom.addClass( body, 'page-template-' + pageTemplate );
- $( document ).trigger( 'editor-classchange' );
- }
-
- } );
-
- }
-
-
-
-
-
-} );
diff --git a/library/readme.md b/library/readme.md
index 8e418b3..5495109 100644
--- a/library/readme.md
+++ b/library/readme.md
@@ -5,8 +5,6 @@
This framework, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.
-*Requires at least WordPress 4.4.*
-
For more info please visit https://github.com/webmandesign/webman-theme-framework
*(C) Copyright WebMan Design, Oliver Juhas*
diff --git a/library/scss/customize-rtl.scss b/library/scss/customize-rtl.scss
index 85cfc56..1fdee32 100644
--- a/library/scss/customize-rtl.scss
+++ b/library/scss/customize-rtl.scss
@@ -3,9 +3,11 @@
//
// Customize RTL styles
//
-// @package WebMan WordPress Theme Framework
// @subpackage Customize
//
+// @package WebMan WordPress Theme Framework
+// @copyright WebMan Design, Oliver Juhas
+//
diff --git a/library/scss/customize.scss b/library/scss/customize.scss
index 127e32e..b8c7174 100644
--- a/library/scss/customize.scss
+++ b/library/scss/customize.scss
@@ -3,11 +3,13 @@
//
// Customize styles
//
-// @package WebMan WordPress Theme Framework
// @subpackage Customize
//
+// @package WebMan WordPress Theme Framework
+// @copyright WebMan Design, Oliver Juhas
+//
// @since 1.5.0
-// @version 1.5.0
+// @version 2.7.0
//
diff --git a/library/scss/styles/_customize.scss b/library/scss/styles/_customize.scss
index b1a4f95..f72203b 100644
--- a/library/scss/styles/_customize.scss
+++ b/library/scss/styles/_customize.scss
@@ -3,11 +3,13 @@
//
// Customize styles
//
-// @package WebMan WordPress Theme Framework
// @subpackage Customize
//
+// @package WebMan WordPress Theme Framework
+// @copyright WebMan Design, Oliver Juhas
+//
// @since 1.5.0
-// @version 2.6.0
+// @version 2.7.0
//
diff --git a/library/scss/styles/_welcome.scss b/library/scss/styles/_welcome.scss
index 78f29ea..03442fb 100644
--- a/library/scss/styles/_welcome.scss
+++ b/library/scss/styles/_welcome.scss
@@ -3,11 +3,13 @@
//
// Welcome page styles
//
-// @package WebMan WordPress Theme Framework
-// @subpackage Welcome page
+// @subpackage Welcome
+// @subpackage Admin
+//
+// @package WebMan WordPress Theme Framework
//
// @since 1.5.0
-// @version 2.5.5
+// @version 2.7.0
//
diff --git a/library/scss/welcome-rtl.scss b/library/scss/welcome-rtl.scss
index 9956256..c1d5d97 100644
--- a/library/scss/welcome-rtl.scss
+++ b/library/scss/welcome-rtl.scss
@@ -3,8 +3,10 @@
//
// Welcome page RTL styles
//
-// @package WebMan WordPress Theme Framework
-// @subpackage Welcome page
+// @subpackage Welcome
+// @subpackage Admin
+//
+// @package WebMan WordPress Theme Framework
//
diff --git a/library/scss/welcome.scss b/library/scss/welcome.scss
index 6c20c28..ea31586 100644
--- a/library/scss/welcome.scss
+++ b/library/scss/welcome.scss
@@ -3,11 +3,13 @@
//
// Welcome page styles
//
-// @package WebMan WordPress Theme Framework
-// @subpackage Welcome page
+// @subpackage Welcome
+// @subpackage Admin
+//
+// @package WebMan WordPress Theme Framework
//
// @since 1.5.0
-// @version 1.5.0
+// @version 2.7.0
//
diff --git a/style.css b/style.css
index 95efbd6..1f73ca1 100644
--- a/style.css
+++ b/style.css
@@ -3,7 +3,7 @@ Theme Name: Modern
Theme URI: https://www.webmandesign.eu/portfolio/modern-wordpress-theme/
Author: WebMan Design
Author URI: https://www.webmandesign.eu/
-Version: 2.1.0
+Version: 2.2.0
Text Domain: modern
Domain Path: /languages
License: GNU General Public License v3
diff --git a/template-parts/footer/site-info.php b/template-parts/footer/site-info.php
index 339e727..d4a67bb 100644
--- a/template-parts/footer/site-info.php
+++ b/template-parts/footer/site-info.php
@@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
- * @version 2.1.0
+ * @version 2.2.0
*/
@@ -15,7 +15,7 @@
// Helper variables
- $site_info_text = trim( (string) get_theme_mod( 'texts_site_info' ) );
+ $site_info_text = trim( (string) Modern_Library_Customize::get_theme_mod( 'texts_site_info' ) );
// Requirements check
diff --git a/template-parts/intro/intro-content.php b/template-parts/intro/intro-content.php
index ba162cf..9f22acf 100644
--- a/template-parts/intro/intro-content.php
+++ b/template-parts/intro/intro-content.php
@@ -6,7 +6,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
- * @version 2.0.0
+ * @version 2.2.0
*/
@@ -38,7 +38,7 @@
// Customizer option text...
$title = trim(
// This is already sanitized in database.
- get_theme_mod( 'texts_intro', esc_html__( 'Welcome to our site!', 'modern' ) )
+ Modern_Library_Customize::get_theme_mod( 'texts_intro' )
);
// ...or site tagline
diff --git a/template-parts/loop/loop-front-blog.php b/template-parts/loop/loop-front-blog.php
index d44859c..1cda9dc 100644
--- a/template-parts/loop/loop-front-blog.php
+++ b/template-parts/loop/loop-front-blog.php
@@ -9,7 +9,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
- * @version 2.0.0
+ * @version 2.2.0
*/
@@ -34,7 +34,7 @@
$query = new WP_Query( (array) apply_filters( 'wmhook_modern_loop_query', array(
'post_type' => $post_type,
- 'posts_per_page' => absint( get_theme_mod( 'layout_posts_per_page_front_blog', 6 ) ),
+ 'posts_per_page' => absint( Modern_Library_Customize::get_theme_mod( 'layout_posts_per_page_front_blog' ) ),
'paged' => 1,
'no_found_rows' => true,
'ignore_sticky_posts' => true,
diff --git a/template-parts/loop/loop-front-portfolio.php b/template-parts/loop/loop-front-portfolio.php
index 223bc57..3ca146b 100644
--- a/template-parts/loop/loop-front-portfolio.php
+++ b/template-parts/loop/loop-front-portfolio.php
@@ -9,7 +9,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
- * @version 2.0.0
+ * @version 2.2.0
*/
@@ -34,7 +34,7 @@
$query = new WP_Query( (array) apply_filters( 'wmhook_modern_loop_query', array(
'post_type' => $post_type,
- 'posts_per_page' => absint( get_theme_mod( 'layout_posts_per_page_front_portfolio', 6 ) ),
+ 'posts_per_page' => absint( Modern_Library_Customize::get_theme_mod( 'layout_posts_per_page_front_portfolio' ) ),
'paged' => 1,
'no_found_rows' => true,
'ignore_sticky_posts' => true,
diff --git a/template-parts/loop/loop-front-testimonials.php b/template-parts/loop/loop-front-testimonials.php
index 556d551..521a606 100644
--- a/template-parts/loop/loop-front-testimonials.php
+++ b/template-parts/loop/loop-front-testimonials.php
@@ -9,7 +9,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
- * @version 2.0.0
+ * @version 2.2.0
*/
@@ -34,7 +34,7 @@
$query = new WP_Query( (array) apply_filters( 'wmhook_modern_loop_query', array(
'post_type' => $post_type,
- 'posts_per_page' => absint( get_theme_mod( 'layout_posts_per_page_front_testimonials', 3 ) ),
+ 'posts_per_page' => absint( Modern_Library_Customize::get_theme_mod( 'layout_posts_per_page_front_testimonials' ) ),
'paged' => 1,
'no_found_rows' => true,
'ignore_sticky_posts' => true,
diff --git a/template-parts/menu/menu-primary.php b/template-parts/menu/menu-primary.php
index a02d435..5ee436b 100644
--- a/template-parts/menu/menu-primary.php
+++ b/template-parts/menu/menu-primary.php
@@ -10,7 +10,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 2.0.0
- * @version 2.0.0
+ * @version 2.2.0
*/
@@ -19,7 +19,7 @@
// Helper variables
- $is_mobile_nav_enabled = get_theme_mod( 'navigation_mobile', true );
+ $is_mobile_nav_enabled = Modern_Library_Customize::get_theme_mod( 'navigation_mobile' );
?>