Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add media placeholders #245

Merged
merged 1 commit into from
Mar 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions shared/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ body {
#editor figure {
clear: both;
float: none;
margin: 1em 0;
margin-left: auto;
margin-right: auto;
width: 100%;
/*transition: margin 0.5s, width 0.5s;*/
}
Expand Down Expand Up @@ -152,7 +153,7 @@ body {
#editor figure img,
#editor figure iframe {
display: block;
margin: 0;
margin: 0 auto;
}

#editor pre {
Expand Down
114 changes: 84 additions & 30 deletions tinymce-single/blocks/core/gallery/register.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,85 @@
window.wp.blocks.registerBlock( {
name: 'gallery',
namespace: 'core',
displayName: 'Gallery',
type: 'media',
keywords: [],
icon: 'gridicons-image-multiple',
editable: [ 'figcaption' ],
controls: [
'block-align-left',
'block-align-center',
'block-align-right',
'block-align-full',
// {
// type: 'select',
// label: 'Columns'
// },
// {
// type: 'button',
// label: 'Columns',
// icon: 'gridicons-image',
// command: function( editor, node ) {
// // body...
// }
// },
{
icon: 'gridicons-cog'
( function( wp ) {

function insertEmpty() {
return (
'<figure data-wp-block-setting-column="2">' +
'<figure>' +
'<div class="wp-blocks-placeholder">' +
'<svg width="48" height="48">' +
'<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../shared/gridicons.svg#gridicons-add-outline"></use>' +
'</svg>' +
'<p>Pick image</p>' +
'</div>' +
'</figure>' +
'<figure>' +
'<div class="wp-blocks-placeholder">' +
'<svg width="48" height="48">' +
'<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../shared/gridicons.svg#gridicons-add-outline"></use>' +
'</svg>' +
'<p>Pick image</p>' +
'</div>' +
'</figure>' +
'</figure>'
);
}

function pickTarget( parents, child ) {
for ( var i = 0; i < parents.length; i++ ) {
if ( parents[ i ] === child || parents[ i ].contains( child ) ) {
return parents[ i ]
}
}
],
insert: function() {}
} );
}

function onClick( event, block, adjustUI ) {
var target = pickTarget( block.querySelectorAll( 'div' ), event.target );

if ( ! target ) {
return;
}

if ( ( ' ' + target.className + ' ' ).indexOf( ' wp-blocks-placeholder ' ) === -1 ) {
return;
}

wp.filePicker( false, 'image/*' )
.then( function( files ) {
if ( ! files || ! files.length ) {
return;
}

if ( files[0].type.indexOf( 'image/' ) !== 0 ) {
return;
}

var img = document.createElement( 'img' );

img.src = URL.createObjectURL( files[0] );
img.onload = adjustUI;

target.parentNode.replaceChild( img, target );
} )
.catch( function() {} );
}

wp.blocks.registerBlock( {
name: 'gallery',
namespace: 'core',
displayName: 'Gallery',
type: 'media',
keywords: [],
icon: 'gridicons-image-multiple',
editable: [ 'figcaption' ],
controls: [
'block-align-left',
'block-align-center',
'block-align-right',
'block-align-full',
{
icon: 'gridicons-cog'
}
],
insert: insertEmpty,
onClick: onClick
} );
} )( window.wp );
2 changes: 1 addition & 1 deletion tinymce-single/blocks/core/gallery/structure.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

#editor figure[data-wp-block-type="core:gallery"][data-wp-block-setting-column="2"] figure {
width: 43%;
width: 49%;
}

#editor figure[data-wp-block-type="core:gallery"][data-wp-block-setting-column="3"] figure {
Expand Down
120 changes: 85 additions & 35 deletions tinymce-single/blocks/core/image/register.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,90 @@
window.wp.blocks.registerBlock( {
name: 'image',
namespace: 'core',
displayName: 'Image',
type: 'media',
icon: 'gridicons-image',
editable: [ 'figcaption' ],
controls: [
'block-align-left',
'block-align-center',
'block-align-right',
'block-align-full',
{
icon: 'gridicons-caption',
onClick: function( block ) {
var figcaption = block.querySelector( 'figcaption' );

if ( figcaption ) {
block.removeChild( figcaption );
} else {
block.insertAdjacentHTML( 'beforeend',
'<figcaption><br></figcaption>' );
}
( function( wp ) {

window.wp.blocks.selectBlock( block );
},
isActive: function( block ) {
return !! block.querySelector( 'figcaption' );
}
}
],
insert: function() {
function insertEmpty() {
return (
'<figure data-wp-block-type="core:image">' +
'<img src="https://cldup.com/HN3-c7ER9p.jpg" alt="">' +
'<figcaption>I have no idea which mountain this is. It looks tall!</figcaption>' +
'<figure>' +
'<div class="wp-blocks-placeholder">' +
'<svg width="48" height="48">' +
'<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../shared/gridicons.svg#gridicons-add-outline"></use>' +
'</svg>' +
'<p>Pick image</p>' +
'</div>' +
'</figure>'
);
}
} );

function pickTarget( parents, child ) {
for ( var i = 0; i < parents.length; i++ ) {
if ( parents[ i ] === child || parents[ i ].contains( child ) ) {
return parents[ i ]
}
}
}

function onClick( event, block, adjustUI ) {
var target = pickTarget( block.querySelectorAll( 'div' ), event.target );

if ( ! target ) {
return;
}

if ( ( ' ' + target.className + ' ' ).indexOf( ' wp-blocks-placeholder ' ) === -1 ) {
return;
}

wp.filePicker( false, 'image/*' )
.then( function( files ) {
if ( ! files || ! files.length ) {
return;
}

if ( files[0].type.indexOf( 'image/' ) !== 0 ) {
return;
}

var img = document.createElement( 'img' );

img.src = URL.createObjectURL( files[0] );
img.onload = adjustUI;

target.parentNode.replaceChild( img, target );
} )
.catch( function() {} );
}

wp.blocks.registerBlock( {
name: 'image',
namespace: 'core',
displayName: 'Image',
type: 'media',
icon: 'gridicons-image',
editable: [ 'figcaption' ],
controls: [
'block-align-left',
'block-align-center',
'block-align-right',
'block-align-full',
{
icon: 'gridicons-caption',
onClick: function( block ) {
var figcaption = block.querySelector( 'figcaption' );

if ( figcaption ) {
block.removeChild( figcaption );
} else {
block.insertAdjacentHTML( 'beforeend',
'<figcaption><br></figcaption>' );
}

window.wp.blocks.selectBlock( block );
},
isActive: function( block ) {
return !! block.querySelector( 'figcaption' );
}
}
],
insert: insertEmpty,
onClick: onClick
} );

} )( window.wp );
Loading