<!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>[7581] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php: Gutenberg: Remove some redundant `sprintf()` calls in the inline javascript.</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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/7581">7581</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7581","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-08-02 00:58:51 +0000 (Thu, 02 Aug 2018)</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'>Gutenberg: Remove some redundant `sprintf()` calls in the inline javascript.
See <a href="http://meta.trac.wordpress.org/ticket/3703">#3703</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubgutenbergfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubgutenbergfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php 2018-08-02 00:55:50 UTC (rev 7580)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/gutenberg/functions.php 2018-08-02 00:58:51 UTC (rev 7581)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,30 +34,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use a middleware provider to intercept and modify API calls. Short-circuit POST requests, bound queries, allow media, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'wp-api-fetch',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf(
- 'wp.apiFetch.use( function( options, next ) {
- var isWhitelistedEndpoint = (
- lodash.startsWith( options.path, "/oembed/1.0/proxy" ) ||
- lodash.startsWith( options.path, "/gutenberg/v1/block-renderer" )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp.apiFetch.use( function( options, next ) {
+ var isWhitelistedEndpoint = (
+ lodash.startsWith( options.path, "/oembed/1.0/proxy" ) ||
+ lodash.startsWith( options.path, "/gutenberg/v1/block-renderer" )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prevent non-whitelisted non-GET requests (ie. POST) to prevent errors
- if ( options.method && options.method !== "GET" && ! isWhitelistedEndpoint ) {
- // This works in enough cases to be the default return value.
- return Promise.resolve( options.data );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent non-whitelisted non-GET requests (ie. POST) to prevent errors
+ if ( options.method && options.method !== "GET" && ! isWhitelistedEndpoint ) {
+ // This works in enough cases to be the default return value.
+ return Promise.resolve( options.data );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add limits to all GET queries which attempt unbound queries
- options.path = options.path.replace( "per_page=-1", "per_page=10" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add limits to all GET queries which attempt unbound queries
+ options.path = options.path.replace( "per_page=-1", "per_page=10" );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Load images with the view context, seems to work
- if ( lodash.startsWith( options.path, "/wp/v2/media/" ) ) {
- options.path = options.path.replace( "context=edit", "context=view" );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Load images with the view context, seems to work
+ if ( lodash.startsWith( options.path, "/wp/v2/media/" ) ) {
+ options.path = options.path.replace( "context=edit", "context=view" );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return next( options );
- } );'
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return next( options );
+ } );',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,48 +109,46 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a middleware provider which intercepts all uploads and stores them within the browser
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'wp-api-fetch',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf(
- 'wp.apiFetch.use( function( options, next ) {
- if ( options.method == "POST" && options.path == "/wp/v2/media" ) {
- var file = options.body.get("file");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp.apiFetch.use( function( options, next ) {
+ if ( options.method == "POST" && options.path == "/wp/v2/media" ) {
+ var file = options.body.get("file");
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.fakeUploadedMedia = window.fakeUploadedMedia || [];
- if ( ! window.fakeUploadedMedia.length ) {
- window.fakeUploadedMedia[9999000] = {};
- }
- var id = window.fakeUploadedMedia.length;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.fakeUploadedMedia = window.fakeUploadedMedia || [];
+ if ( ! window.fakeUploadedMedia.length ) {
+ window.fakeUploadedMedia[9999000] = {};
+ }
+ var id = window.fakeUploadedMedia.length;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.fakeUploadedMedia[ id ] = {
- "id": id,
- "date": "", "date_gmt": "", "modified": "", "modified_gmt": "",
- "guid": {}, "title": { "rendered": file.name, "raw": file.name },
- "description": {}, "caption": {}, "alt_text": "",
- "slug": file.name, "status": "inherit", "type": "attachment", "link": "",
- "author": 0, "comment_status": "open", "ping_status": "closed",
- "media_details": {}, "media_type": file.type.split("/")[0], "mime_type": file.type,
- "source_url": "", // This gets filled below with a data uri
- "_links": {}
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.fakeUploadedMedia[ id ] = {
+ "id": id,
+ "date": "", "date_gmt": "", "modified": "", "modified_gmt": "",
+ "guid": {}, "title": { "rendered": file.name, "raw": file.name },
+ "description": {}, "caption": {}, "alt_text": "",
+ "slug": file.name, "status": "inherit", "type": "attachment", "link": "",
+ "author": 0, "comment_status": "open", "ping_status": "closed",
+ "media_details": {}, "media_type": file.type.split("/")[0], "mime_type": file.type,
+ "source_url": "", // This gets filled below with a data uri
+ "_links": {}
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new Promise( function( resolve ) {
- var a = new FileReader();
- a.onload = function(e) {
- window.fakeUploadedMedia[ id ].source_url = e.target.result;
- resolve( window.fakeUploadedMedia[ id ] );
- }
- a.readAsDataURL( file );
- } );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new Promise( function( resolve ) {
+ var a = new FileReader();
+ a.onload = function(e) {
+ window.fakeUploadedMedia[ id ].source_url = e.target.result;
+ resolve( window.fakeUploadedMedia[ id ] );
+ }
+ a.readAsDataURL( file );
+ } );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Drag droped media of ID 9999xxx is stored within the Browser
- var path_id_match = options.path.match( "^/wp/v2/media/(9999\\\\d+)" );
- if ( path_id_match ) {
- return Promise.resolve( window.fakeUploadedMedia[ path_id_match[1] ] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Drag droped media of ID 9999xxx is stored within the Browser
+ var path_id_match = options.path.match( "^/wp/v2/media/(9999\\\\d+)" );
+ if ( path_id_match ) {
+ return Promise.resolve( window.fakeUploadedMedia[ path_id_match[1] ] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return next( options );
- } );'
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return next( options );
+ } );',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script(
</span></span></pre>
</div>
</div>
</body>
</html>