<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[41344] trunk/src/wp-admin/js: Text widget: add the Add Media button and enable the `wpview` plugin to show embedded media previews in the editor.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41344">41344</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41344","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-08 10:56:10 +0000 (Fri, 08 Sep 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Text widget: add the Add Media button and enable the `wpview` plugin to show embedded media previews in the editor.
Props westonruter, azaozz.
See <a href="https://core.trac.wordpress.org/ticket/40854">#40854</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditorjs">trunk/src/wp-admin/js/editor.js</a></li>
<li><a href="#trunksrcwpadminjswidgetstextwidgetsjs">trunk/src/wp-admin/js/widgets/text-widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjseditorjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/editor.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/editor.js 2017-09-08 06:03:09 UTC (rev 41343)
+++ trunk/src/wp-admin/js/editor.js 2017-09-08 10:56:10 UTC (rev 41344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,18 +562,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add wrap and the Visual|Text tabs.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( settings.tinymce && settings.quicktags ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $textarea = $( '#' + id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> var $wrap = $( '<div>' ).attr( {
</span><span class="cx" style="display: block; padding: 0 10px"> 'class': 'wp-core-ui wp-editor-wrap tmce-active',
</span><span class="cx" style="display: block; padding: 0 10px"> id: 'wp-' + id + '-wrap'
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> var $editorContainer = $( '<div class="wp-editor-container">' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> var $button = $( '<button>' ).attr( {
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'button',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-wp-editor-id': id
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $editorTools = $( '<div class="wp-editor-tools">' );
+
+ if ( settings.mediaButtons ) {
+ var buttonText = 'Add Media';
+
+ if ( window._wpMediaViewsL10n && window._wpMediaViewsL10n.addMedia ) {
+ buttonText = window._wpMediaViewsL10n.addMedia;
+ }
+
+ var $addMediaButton = $( '<button type="button" class="button insert-media add_media">' );
+
+ $addMediaButton.append( '<span class="wp-media-buttons-icon"></span>' );
+ $addMediaButton.append( document.createTextNode( ' ' + buttonText ) );
+ $addMediaButton.data( 'editor', id );
+
+ $editorTools.append(
+ $( '<div class="wp-media-buttons">' )
+ .append( $addMediaButton )
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wrap.append(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '<div class="wp-editor-tools">' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $editorTools
</ins><span class="cx" style="display: block; padding: 0 10px"> .append( $( '<div class="wp-editor-tabs">' )
</span><span class="cx" style="display: block; padding: 0 10px"> .append( $button.clone().attr({
</span><span class="cx" style="display: block; padding: 0 10px"> id: id + '-tmce',
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetstextwidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/widgets/text-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/widgets/text-widgets.js 2017-09-08 06:03:09 UTC (rev 41343)
+++ trunk/src/wp-admin/js/widgets/text-widgets.js 2017-09-08 10:56:10 UTC (rev 41344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The user has disabled TinyMCE.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof window.tinymce === 'undefined' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp.editor.initialize( id, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- quicktags: true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ quicktags: true,
+ mediaButtons: true
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,11 +243,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.editor.remove( id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add or enable the `wpview` plugin.
+ $( document ).one( 'wp-before-tinymce-init.text-widget-init', function( event, init ) {
+ // If somebody has removed all plugins, they must have a good reason.
+ // Keep it that way.
+ if ( ! init.plugins ) {
+ return;
+ } else if ( ! /\bwpview\b/.test( init.plugins ) ) {
+ init.plugins += ',wpview';
+ }
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp.editor.initialize( id, {
</span><span class="cx" style="display: block; padding: 0 10px"> tinymce: {
</span><span class="cx" style="display: block; padding: 0 10px"> wpautop: true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- quicktags: true
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ quicktags: true,
+ mediaButtons: true
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>