Fix lint errors in the mobile branch (#12990)

* Revert changes to lib/load.php * Fix lint errors in More * Fix lint error for PlainText * Fix lint error in RichText
WordPress · Dec 19, 2018 · f061815 · f061815
1 parent 6557564
commit f061815
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git 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' ) ) {

diff --git 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 <View style={ styles[ 'block-library-more__line' ] } />
+		return <View style={ styles[ 'block-library-more__line' ] } />;
 	}
 
 	renderText() {
@@ -71,12 +71,12 @@ export default class MoreEdit extends Component {
 					onBlur={ onBlur }
 				/>
 			</View>
-		)
+		);
 	}
 
 	render() {
 		return (
-			<View style={ styles[ 'block-library-more__container' ]}>
+			<View style={ styles[ 'block-library-more__container' ] }>
 				{ this.renderLine() }
 				{ this.renderText() }
 				{ this.renderLine() }

diff --git 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

diff --git 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 );