Extensibility: Fix the anchor extension after rebase

WordPress · Nov 16, 2017 · 2aeb51a · 2aeb51a
1 parent 032ddc4
commit 2aeb51a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/blocks/api/registration.js b/blocks/api/registration.js
@@ -119,19 +119,15 @@ export function registerBlockType( name, settings ) {
 		settings.icon = 'block-default';
 	}
 
-	const attributes = settings.attributes ?
-		settings.attributes :
-		get( window._wpBlocksAttributes, name, {} );
-
-	let block = blocks[ name ] = {
-		...settings,
+	settings = {
 		name,
-		attributes,
+		attributes: get( window._wpBlocksAttributes, name, {} ),
+		...settings,
 	};
 
-	block = applyFilters( 'registerBlockType', block, name );
+	settings = applyFilters( 'registerBlockType', settings, name );
 
-	return blocks[ name ] = block;
+	return blocks[ name ] = settings;
 }
 
 /**

diff --git a/blocks/hooks/anchor.js b/blocks/hooks/anchor.js
@@ -12,7 +12,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { source, hasBlockSupport } from '../api';
+import { hasBlockSupport } from '../api';
 import InspectorControls from '../inspector-controls';
 
 /**
@@ -35,7 +35,9 @@ export function addAttribute( settings ) {
 		settings.attributes = assign( settings.attributes, {
 			anchor: {
 				type: 'string',
-				source: source.attr( '*', 'id' ),
+				source: 'attribute',
+				attribute: 'id',
+				selector: '*',
 			},
 		} );
 	}