From 6d49c4145692d7bd3e6f8082c590fc9aebb97203 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Tue, 18 Dec 2018 18:09:23 +0100 Subject: [PATCH 1/4] Revert changes to lib/load.php --- lib/load.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/load.php b/lib/load.php index 0c55db3a37f6c..ee1c973f99568 100644 --- a/lib/load.php +++ b/lib/load.php @@ -62,7 +62,10 @@ if ( ! function_exists( 'render_block_core_categories' ) ) { require dirname( __FILE__ ) . '/../packages/block-library/src/categories/index.php'; } -if ( ! function_exists( 'render_block_core_latest_comments' ) ) { +// Currently merged in core as `gutenberg_render_block_core_latest_comments`, +// expected to change soon. +if ( ! function_exists( 'render_block_core_latest_comments' ) + && ! function_exists( 'gutenberg_render_block_core_latest_comments' ) ) { require dirname( __FILE__ ) . '/../packages/block-library/src/latest-comments/index.php'; } if ( ! function_exists( 'render_block_core_latest_posts' ) ) { From 8880b53bdd3b3fe55c9077adf31422ef97adde26 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Tue, 18 Dec 2018 18:11:17 +0100 Subject: [PATCH 2/4] Fix lint errors in More --- packages/block-library/src/more/edit.native.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/block-library/src/more/edit.native.js b/packages/block-library/src/more/edit.native.js index 2a17104d3077b..6a73a44c73b6a 100644 --- a/packages/block-library/src/more/edit.native.js +++ b/packages/block-library/src/more/edit.native.js @@ -1,7 +1,7 @@ /** * External dependencies */ -import { View, Text } from 'react-native'; +import { View } from 'react-native'; /** * WordPress dependencies @@ -48,7 +48,7 @@ export default class MoreEdit extends Component { } renderLine() { - return + return ; } renderText() { @@ -71,12 +71,12 @@ export default class MoreEdit extends Component { onBlur={ onBlur } /> - ) + ); } render() { return ( - + { this.renderLine() } { this.renderText() } { this.renderLine() } From 70faea5ad437a92c5c68c8c400951f43b80e8867 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Tue, 18 Dec 2018 18:19:41 +0100 Subject: [PATCH 3/4] Fix lint error for PlainText --- packages/editor/src/components/plain-text/index.native.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/editor/src/components/plain-text/index.native.js b/packages/editor/src/components/plain-text/index.native.js index ec5fb80247101..35ffd2782a133 100644 --- a/packages/editor/src/components/plain-text/index.native.js +++ b/packages/editor/src/components/plain-text/index.native.js @@ -14,7 +14,10 @@ import { Component } from '@wordpress/element'; import styles from './style.scss'; export default class PlainText extends Component { - isIOS: boolean = Platform.OS === 'ios'; + constructor() { + super( ...arguments ); + this.isIOS = Platform.OS === 'ios'; + } componentDidMount() { // if isSelected is true, we should request the focus on this TextInput From 2d1fafc204f86f713629b6f21342e231829921ed Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Tue, 18 Dec 2018 18:41:29 +0100 Subject: [PATCH 4/4] Fix lint error in RichText --- packages/editor/src/components/rich-text/index.native.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/editor/src/components/rich-text/index.native.js b/packages/editor/src/components/rich-text/index.native.js index 11d3ec44cf35f..f6796a97fdbaa 100644 --- a/packages/editor/src/components/rich-text/index.native.js +++ b/packages/editor/src/components/rich-text/index.native.js @@ -64,10 +64,9 @@ export function getFormatValue( formatName ) { } export class RichText extends Component { - isIOS: boolean = Platform.OS === 'ios'; - constructor() { super( ...arguments ); + this.isIOS = Platform.OS === 'ios'; this.onChange = this.onChange.bind( this ); this.onEnter = this.onEnter.bind( this ); this.onBackspace = this.onBackspace.bind( this );