Removed unused variables and withInstanceId.

Thanks for the feedback, @paulwilde.
WordPress · Aug 8, 2018 · 589eeec · 589eeec
1 parent de5f8b9
commit 589eeec
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 32 deletions.
diff --git a/edit-post/assets/stylesheets/main.scss b/edit-post/assets/stylesheets/main.scss
@@ -129,22 +129,22 @@ body.gutenberg-editor-page {
 .editor-block-list__block,
 .components-popover {
 	.input-control, // Upstream name is `.regular-text`.
-	input[type=text],
-	input[type=search],
-	input[type=radio],
-	input[type=tel],
-	input[type=time],
-	input[type=url],
-	input[type=week],
-	input[type=password],
-	input[type=checkbox],
-	input[type=color],
-	input[type=date],
-	input[type=datetime],
-	input[type=datetime-local],
-	input[type=email],
-	input[type=month],
-	input[type=number],
+	input[type="text"],
+	input[type="search"],
+	input[type="radio"],
+	input[type="tel"],
+	input[type="time"],
+	input[type="url"],
+	input[type="week"],
+	input[type="password"],
+	input[type="checkbox"],
+	input[type="color"],
+	input[type="date"],
+	input[type="datetime"],
+	input[type="datetime-local"],
+	input[type="email"],
+	input[type="month"],
+	input[type="number"],
 	select,
 	textarea {
 		margin-top: 0; // These override a "margin: 1px" from core.
@@ -170,7 +170,7 @@ body.gutenberg-editor-page {
 		}
 	}
 
-	input[type=checkbox] {
+	input[type="checkbox"] {
 		border: $border-width + 1 solid $dark-gray-300;
 		border-radius: $radius-round-rectangle / 2;
 		margin-right: 12px;
@@ -182,15 +182,15 @@ body.gutenberg-editor-page {
 		}
 
 		&:checked {
-			background: theme( toggle );
-			border-color: theme( toggle );
+			background: theme(toggle);
+			border-color: theme(toggle);
 		}
 
 		&:checked:focus {
 			box-shadow: 0 0 0 2px $dark-gray-500;
 		}
 
-		&:before {
+		&::before {
 			margin: -4px 0 0 -5px;
 			color: $white;
 		}

diff --git a/packages/editor/src/components/post-comments/index.js b/packages/editor/src/components/post-comments/index.js
@@ -3,10 +3,10 @@
  */
 import { __ } from '@wordpress/i18n';
 import { CheckboxControl } from '@wordpress/components';
-import { withInstanceId, compose } from '@wordpress/compose';
+import { compose } from '@wordpress/compose';
 import { withSelect, withDispatch } from '@wordpress/data';
 
-function PostComments( { commentStatus = 'open', instanceId, ...props } ) {
+function PostComments( { commentStatus = 'open', ...props } ) {
 	const onToggleComments = () => props.editPost( { comment_status: commentStatus === 'open' ? 'closed' : 'open' } );
 
 	return (
@@ -27,5 +27,4 @@ export default compose( [
 	withDispatch( ( dispatch ) => ( {
 		editPost: dispatch( 'core/editor' ).editPost,
 	} ) ),
-	withInstanceId,
 ] )( PostComments );
diff --git a/packages/editor/src/components/post-pending-status/index.js b/packages/editor/src/components/post-pending-status/index.js
@@ -4,14 +4,14 @@
 import { __ } from '@wordpress/i18n';
 import { CheckboxControl } from '@wordpress/components';
 import { withSelect, withDispatch } from '@wordpress/data';
-import { withInstanceId, compose } from '@wordpress/compose';
+import { compose } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import PostPendingStatusCheck from './check';
 
-export function PostPendingStatus( { instanceId, status, onUpdateStatus } ) {
+export function PostPendingStatus( { status, onUpdateStatus } ) {
 	const togglePendingStatus = () => {
 		const updatedStatus = status === 'pending' ? 'draft' : 'pending';
 		onUpdateStatus( updatedStatus );
@@ -37,5 +37,4 @@ export default compose(
 			dispatch( 'core/editor' ).editPost( { status } );
 		},
 	} ) ),
-	withInstanceId
 )( PostPendingStatus );
diff --git a/packages/editor/src/components/post-pingbacks/index.js b/packages/editor/src/components/post-pingbacks/index.js
@@ -4,9 +4,9 @@
 import { __ } from '@wordpress/i18n';
 import { CheckboxControl } from '@wordpress/components';
 import { withSelect, withDispatch } from '@wordpress/data';
-import { withInstanceId, compose } from '@wordpress/compose';
+import { compose } from '@wordpress/compose';
 
-function PostPingbacks( { pingStatus = 'open', instanceId, ...props } ) {
+function PostPingbacks( { pingStatus = 'open', ...props } ) {
 	const onTogglePingback = () => props.editPost( { ping_status: pingStatus === 'open' ? 'closed' : 'open' } );
 
 	return (
@@ -27,5 +27,4 @@ export default compose( [
 	withDispatch( ( dispatch ) => ( {
 		editPost: dispatch( 'core/editor' ).editPost,
 	} ) ),
-	withInstanceId,
 ] )( PostPingbacks );
diff --git a/packages/editor/src/components/post-sticky/index.js b/packages/editor/src/components/post-sticky/index.js
@@ -4,14 +4,14 @@
 import { __ } from '@wordpress/i18n';
 import { CheckboxControl } from '@wordpress/components';
 import { withSelect, withDispatch } from '@wordpress/data';
-import { withInstanceId, compose } from '@wordpress/compose';
+import { compose } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
 import PostStickyCheck from './check';
 
-export function PostSticky( { onUpdateSticky, postSticky = false, instanceId } ) {
+export function PostSticky( { onUpdateSticky, postSticky = false } ) {
 	return (
 		<PostStickyCheck>
 			<CheckboxControl
@@ -36,5 +36,4 @@ export default compose( [
 			},
 		};
 	} ),
-	withInstanceId,
 ] )( PostSticky );