Skip to content
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

Fixes issue #35 WordPress 5.5 incompatibility #40

Closed
wants to merge 1 commit into from
Closed

Fixes issue #35 WordPress 5.5 incompatibility #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 dist/wp-color-picker-alpha.min.js
100755 → 100644
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 35 additions & 15 deletions src/wp-color-picker-alpha.js
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,35 @@
_after = '<div class="wp-picker-holder" />',
_wrap = '<div class="wp-picker-container" />',
_button = '<input type="button" class="button button-small" />',
// Prevent CSS issues in < WordPress 4.9
_deprecated = ( wpColorPickerL10n.current !== undefined );
// Declare some global variables when is deprecated or not
if ( _deprecated ) {
var _before = '<a tabindex="0" class="wp-color-result" />';
_before = '<button type="button" class="button wp-color-result" aria-expanded="false"><span class="wp-color-result-text"></span></button>',
_wrappingLabel = '<label></label>',
_wrappingLabelText = '<span class="screen-reader-text"></span>',
_deprecated = false;
// Check if wpColorPickerL10n is defined
if ( typeof wpColorPickerL10n !== "undefined" ) {
// wpColorPickerL10n is defined in <= WordPress 5.4
// Prevent CSS issues in < WordPress 4.9. current can only be checked if we know wpColorPickerL10n is defined
_deprecated = ( typeof wpColorPickerL10n.current !== "undefined" );
if ( _deprecated ) {
// Update _before if wpColorPickerL10n.current is defined (< WP 4.9)
_before = '<a tabindex="0" class="wp-color-result" />';
}

var _colorValue = wpColorPickerL10n.defaultLabel,
_selectColor = wpColorPickerL10n.pick,
_defaultString = wpColorPickerL10n.defaultString,
_defaultAriaLabel = wpColorPickerL10n.defaultAriaLabel,
_clearString = wpColorPickerL10n.clear,
_clearAriaLabel = wpColorPickerL10n.clearAriaLabel;
} else {
var _before = '<button type="button" class="button wp-color-result" aria-expanded="false"><span class="wp-color-result-text"></span></button>',
_wrappingLabel = '<label></label>',
_wrappingLabelText = '<span class="screen-reader-text"></span>';
// wpColorPickerL10n is not defined in WordPress 5.5+
var __ = wp.i18n.__,
_colorValue = __( 'Color value' ),
_selectColor = __( 'Select Color' ),
_defaultString = __( 'Default' ),
_defaultAriaLabel = __( 'Select default color' ),
_clearString = __( 'Clear' ),
_clearAriaLabel = __( 'Clear color' );
}
/**
* Overwrite Color
Expand Down Expand Up @@ -96,7 +116,7 @@
self.toggler = $( _before )
.insertBefore( el )
.css( { backgroundColor : self.initialValue } )
.attr( 'title', wpColorPickerL10n.pick )
.attr( 'title', _selectColor )
.attr( 'data-current', wpColorPickerL10n.current );
self.pickerContainer = $( _after ).insertAfter( el );
self.button = $( _button ).addClass('hidden');
Expand All @@ -111,7 +131,7 @@
// Insert the default label text.
self.wrappingLabelText = $( _wrappingLabelText )
.insertBefore( el )
.text( wpColorPickerL10n.defaultLabel );
.text( _colorValue );
}

/*
Expand All @@ -129,7 +149,7 @@
.insertBefore( self.wrappingLabel )
.css( { backgroundColor: self.initialValue } );
// Set the toggle button span element text.
self.toggler.find( '.wp-color-result-text' ).text( wpColorPickerL10n.pick );
self.toggler.find( '.wp-color-result-text' ).text( _selectColor );
// Set up the Iris container and insert it after the wrapping label.
self.pickerContainer = $( _after ).insertAfter( self.wrappingLabel );
// Store a reference to the Clear/Default button.
Expand All @@ -138,14 +158,14 @@

// Set up the Clear/Default button.
if ( self.options.defaultColor ) {
self.button.addClass( 'wp-picker-default' ).val( wpColorPickerL10n.defaultString );
self.button.addClass( 'wp-picker-default' ).val( _defaultString );
if ( ! _deprecated ) {
self.button.attr( 'aria-label', wpColorPickerL10n.defaultAriaLabel );
self.button.attr( 'aria-label', _defaultAriaLabel );
}
} else {
self.button.addClass( 'wp-picker-clear' ).val( wpColorPickerL10n.clear );
self.button.addClass( 'wp-picker-clear' ).val( _clearString );
if ( ! _deprecated ) {
self.button.attr( 'aria-label', wpColorPickerL10n.clearAriaLabel );
self.button.attr( 'aria-label', _clearAriaLabel );
}
}

Expand Down