Skip to content

Don't add show_advanced_fonts control if theme doesn't define them #71

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

Open
NateWr wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Don't add show_advanced_fonts control if theme doesn't define them #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e3bf81
Don't add show_advanced_fonts control if theme doesn't define them
NateWr Feb 26, 2016
340d82f
Allow default fonts to specify a title
NateWr Feb 26, 2016
00d13ff
Skip font styles if no selectors are defined
NateWr Mar 4, 2016
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
14 changes: 7 additions & 7 deletions customizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,6 @@ public function theme_font_customizer( $wp_customize ) {

}

}

if( !$has_panel ){
$this->display_inputs( $theme_font_locations, $wp_customize );
} else{
$wp_customize->add_setting(
'show_advanced_fonts',
array( 'transport' => 'postMessage' )
Expand All @@ -301,6 +296,11 @@ public function theme_font_customizer( $wp_customize ) {
'section' => 'theme_fonts_main',
)
);

}

if( !$has_panel ){
$this->display_inputs( $theme_font_locations, $wp_customize );
}

}
Expand Down Expand Up @@ -351,7 +351,7 @@ public function display_inputs( $font_locations, $wp_customize, $section = 'main

$default = array(
'' => 'Select a Font',
$font_location['default'] => $font_location['default'] . ' (default)',
$font_location['default'] => !empty( $font_location['default_title'] ) ? $font_location['default_title'] : sprintf( esc_html__( '%s (default)', 'typecase' ), $font_location['default'] ),
);

$wp_customize->add_control(
Expand Down Expand Up @@ -477,4 +477,4 @@ public function customizer_live_preview(){

}

$typecase_customizer = Typecase_Customizer::init();
$typecase_customizer = Typecase_Customizer::init();
5 changes: 5 additions & 0 deletions typecase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,11 @@ public function display_frontend(){
$import_url .= '|';

$import_url .= str_replace(" ","+",$family).$this->stringify_font_part($weights).$this->stringify_font_part($charsets);

// Skip font styles if no selectors are defined
if ( empty( $selectors ) ) {
continue;
}

$selectors = explode("|",$selectors);

Expand Down