Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecation notices caused by new gutenberg version

This commit is contained in:
claudiulodro 2018-02-26 12:13:08 -08:00
parent 2d6701b107
commit add00960dc
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/woocommerce-blocks/assets/js/products-block.js
View File

@ -89,6 +89,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
var __ = wp.i18n.__;
var RawHTML = wp.element.RawHTML;
var _wp$blocks = wp.blocks,
registerBlockType = _wp$blocks.registerBlockType,
InspectorControls = _wp$blocks.InspectorControls,
@ -822,13 +823,12 @@ registerBlockType('woocommerce/products', {
display = _props$attributes.display,
display_setting = _props$attributes.display_setting;
var className = props.attributes.hasOwnProperty('className') ? props.attributes.className : '';
var shortcode_atts = new Map();
shortcode_atts.set('limit', 'grid' === block_layout ? rows * columns : rows);
if (className || 'list' === block_layout) {
shortcode_atts.set('class', 'list' === block_layout ? className + ' list-layout' : className);
if ('list' === block_layout) {
shortcode_atts.set('class', 'list-layout');
}
if ('grid' === block_layout) {
@ -891,7 +891,11 @@ registerBlockType('woocommerce/products', {
shortcode += ']';
return shortcode;
return wp.element.createElement(
RawHTML,
null,
shortcode
);
}
});

8
plugins/woocommerce-blocks/assets/js/products-block.jsx
View File

@ -1,4 +1,5 @@
const { __ } = wp.i18n;
const { RawHTML } = wp.element;
const { registerBlockType, InspectorControls, BlockControls } = wp.blocks;
const { Toolbar, withAPIData, Dropdown, Dashicon, RangeControl } = wp.components;
const { ToggleControl, SelectControl } = InspectorControls;
@ -541,13 +542,12 @@ registerBlockType( 'woocommerce/products', {
*/
save( props ) {
const { block_layout, rows, columns, display, display_setting } = props.attributes;
const className = props.attributes.hasOwnProperty( 'className' ) ? props.attributes.className : '';
let shortcode_atts = new Map();
shortcode_atts.set( 'limit', 'grid' === block_layout ? rows * columns : rows );
if ( className || 'list' === block_layout ) {
shortcode_atts.set( 'class', 'list' === block_layout ? className + ' list-layout' : className );
if ( 'list' === block_layout ) {
shortcode_atts.set( 'class', 'list-layout' );
}
if ( 'grid' === block_layout ) {
@ -583,6 +583,6 @@ registerBlockType( 'woocommerce/products', {
}
shortcode += ']';
return shortcode;
return <RawHTML>{ shortcode }</RawHTML>;
},
} );