Skip to content

Remove compat shim for placeholder argument #330

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
mattheu merged 3 commits into from
May 19, 2015
Merged

Remove compat shim for placeholder argument #330

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
95922eb
Remove compat shim for `placeholder` argument
danielbachhuber May 19, 2015
35aead5
Update color field to support custom attributes
danielbachhuber May 19, 2015
0378492
Readme mention for 35aead5
danielbachhuber May 19, 2015
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ We've removed the compatibility shim for the magical `content` attribute. If you
* Added Chinese translation.
* Added French translation.
* Added Spanish translation.
* Bug fix: Color field should also support `meta` argument.

### 0.3 (April 27, 2015) ###
* **Breaking change**: We've removed the compatibility shim for the magical `content` attribute. If you were using this to support editing inner content, you'll need to change your UI registration to use `inner_content`.
Expand Down
1 change: 0 additions & 1 deletion inc/class-shortcode-ui.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public function register_shortcode_ui( $shortcode_tag, $args = array() ) {
$args['inner_content'] = array(
'label' => esc_html__( 'Inner Content', 'shortcode-ui' ),
'description' => '',
'placeholder' => '',
);
}

Expand Down
2 changes: 1 addition & 1 deletion inc/fields/class-field-color.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function load_template() {
<script type="text/html" id="tmpl-fusion-shortcake-field-color">
<div class="field-block">
<label for="{{ data.attr }}">{{ data.label }}</label>
<input type="text" name="{{ data.attr }}" id="{{ data.attr }}" value="{{ data.value }}" placeholder="{{ data.placeholder }}" data-default-color="{{ data.value }}"/>
<input type="text" name="{{ data.attr }}" id="{{ data.attr }}" value="{{ data.value }}" data-default-color="{{ data.value }}" {{{ data.meta }}}/>
<# if ( typeof data.description == 'string' ) { #>
<p class="description">{{ data.description }}</p>
<# } #>
Expand Down
7 changes: 0 additions & 7 deletions js/build/field-attachment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,6 @@ var editAttributeField = Backbone.View.extend( {
id: 'shortcode-ui-' + this.model.get( 'attr' ) + '-' + this.model.cid,
}, this.model.toJSON() );

// Handle legacy custom meta.
// Can be removed in 0.4.
if ( data.placeholder ) {
data.meta.placeholder = data.placeholder;
delete data.placeholder;
}

// Convert meta JSON to attribute string.
var _meta = [];
for ( var key in data.meta ) {
Expand Down
7 changes: 0 additions & 7 deletions js/build/field-color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,6 @@ var editAttributeField = Backbone.View.extend( {
id: 'shortcode-ui-' + this.model.get( 'attr' ) + '-' + this.model.cid,
}, this.model.toJSON() );

// Handle legacy custom meta.
// Can be removed in 0.4.
if ( data.placeholder ) {
data.meta.placeholder = data.placeholder;
delete data.placeholder;
}

// Convert meta JSON to attribute string.
var _meta = [];
for ( var key in data.meta ) {
Expand Down
7 changes: 0 additions & 7 deletions js/build/shortcode-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,13 +612,6 @@ var editAttributeField = Backbone.View.extend( {
id: 'shortcode-ui-' + this.model.get( 'attr' ) + '-' + this.model.cid,
}, this.model.toJSON() );

// Handle legacy custom meta.
// Can be removed in 0.4.
if ( data.placeholder ) {
data.meta.placeholder = data.placeholder;
delete data.placeholder;
}

// Convert meta JSON to attribute string.
var _meta = [];
for ( var key in data.meta ) {
Expand Down
7 changes: 0 additions & 7 deletions js/src/views/edit-attribute-field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ var editAttributeField = Backbone.View.extend( {
id: 'shortcode-ui-' + this.model.get( 'attr' ) + '-' + this.model.cid,
}, this.model.toJSON() );

// Handle legacy custom meta.
// Can be removed in 0.4.
if ( data.placeholder ) {
data.meta.placeholder = data.placeholder;
delete data.placeholder;
}

// Convert meta JSON to attribute string.
var _meta = [];
for ( var key in data.meta ) {
Expand Down
1 change: 1 addition & 0 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ We've removed the compatibility shim for the magical `content` attribute. If you
* Added Chinese translation.
* Added French translation.
* Added Spanish translation.
* Bug fix: Color field should also support `meta` argument.

= 0.3 (April 27, 2015) =
* **Breaking change**: We've removed the compatibility shim for the magical `content` attribute. If you were using this to support editing inner content, you'll need to change your UI registration to use `inner_content`.
Expand Down