Merge pull request #218 from WordPress/add/tinymce-single/insert

Allow insertion by returning string or node
WordPress · Mar 9, 2017 · 8ea78fe · 8ea78fe
2 parents 30f90ce + 924af55
commit 8ea78fe
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 19 deletions.
diff --git a/tinymce-single/blocks/core/gallery/register.js b/tinymce-single/blocks/core/gallery/register.js
@@ -26,7 +26,5 @@ window.wp.blocks.registerBlock( {
 			icon: 'gridicons-cog'
 		}
 	],
-	insert: function( block, editor ) {
-
-	}
+	insert: function() {}
 } );
diff --git a/tinymce-single/blocks/elements/blockquote/register.js b/tinymce-single/blocks/elements/blockquote/register.js
@@ -13,8 +13,8 @@ window.wp.blocks.registerBlock( {
 			}
 		}
 	],
-	insert: function( block, editor ) {
-		editor.formatter.apply( 'blockquote', block );
+	insert: function() {
+		return '<blockquote><p><br></p></blockquote>';
 	}
 } );
 
diff --git a/tinymce-single/blocks/elements/headings/register.js b/tinymce-single/blocks/elements/headings/register.js
@@ -33,9 +33,9 @@
 		type: 'text',
 		icon: 'gridicons-heading',
 		controls: getControls(),
-		insert: function( block, editor ) {
+		insert: function() {
 			// Maybe detect best heading based on document outline.
-			editor.formatter.apply( 'h1', block );
+			return '<h1><br></h1>';
 		}
 	} );
 } )( window.wp );
diff --git a/tinymce-single/blocks/elements/horizontal-rule/register.js b/tinymce-single/blocks/elements/horizontal-rule/register.js
@@ -4,7 +4,7 @@ window.wp.blocks.registerBlock( {
 	elements: [ 'hr' ],
 	type: 'separator',
 	icon: 'gridicons-minus',
-	insert: function( block ) {
-		block.parentNode.replaceChild( document.createElement( 'hr' ), block );
+	insert: function() {
+		return '<hr>';
 	}
 } );
diff --git a/tinymce-single/blocks/elements/lists/register.js b/tinymce-single/blocks/elements/lists/register.js
@@ -31,7 +31,7 @@ window.wp.blocks.registerBlock( {
 			}
 		}
 	],
-	insert: function( block, editor ) {
-		editor.execCommand( 'InsertUnorderedList' );
+	insert: function() {
+		return '<ul><li><br></li></ul>';
 	}
 } );
diff --git a/tinymce-single/blocks/elements/paragraph/register.js b/tinymce-single/blocks/elements/paragraph/register.js
@@ -33,7 +33,7 @@ window.wp.blocks.registerBlock( {
 		'text-align-center',
 		'text-align-right'
 	],
-	insert: function( block, editor ) {
-		editor.formatter.apply( 'p', block );
+	insert: function() {
+		return '<p><br></p>';
 	}
 } );
diff --git a/tinymce-single/blocks/elements/preformatted/register.js b/tinymce-single/blocks/elements/preformatted/register.js
@@ -16,7 +16,7 @@ window.wp.blocks.registerBlock( {
 			}
 		}
 	],
-	insert: function( block, editor ) {
-		editor.formatter.apply( 'pre' );
+	insert: function() {
+		return '<pre><br></pre>';
 	}
 } );
diff --git a/tinymce-single/blocks/my-awesome-plugin/youtube/register.js b/tinymce-single/blocks/my-awesome-plugin/youtube/register.js
@@ -14,7 +14,5 @@ window.wp.blocks.registerBlock( {
 			icon: 'gridicons-cog'
 		}
 	],
-	insert: function( block, editor ) {
-
-	}
+	insert: function() {}
 } );
diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
@@ -285,7 +285,24 @@
 								buttons.push( {
 									text: allSettings[ key ].displayName,
 									icon: allSettings[ key ].icon,
-									onClick: allSettings[ key ].insert
+									onClick: ( function( callback ) {
+										return function( block ) {
+											var content = callback.apply( this, arguments );
+
+											if ( content ) {
+												if ( typeof content === 'string' ) {
+													var temp = document.createElement( 'div' );
+													temp.innerHTML = content;
+													content = temp.firstChild;
+													temp = null;
+												}
+
+												block.parentNode.replaceChild( content, block );
+											}
+
+											editor.selection.setCursorLocation( content, 0 );
+										}
+									} )( allSettings[ key ].insert )
 								} );
 							}
 						}