<!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>[31613] trunk/src/wp-admin/js/press-this.js: PressThis: remove the extra .length tests for strings from press-this.js.</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/31613">31613</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/31613","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>2015-03-04 21:00:52 +0000 (Wed, 04 Mar 2015)</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'>PressThis: remove the extra .length tests for strings from press-this.js.
Props stephdau, see <a href="https://core.trac.wordpress.org/ticket/31373">#31373</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjspressthisjs">trunk/src/wp-admin/js/press-this.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjspressthisjs"></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/press-this.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/press-this.js 2015-03-04 20:34:35 UTC (rev 31612)
+++ trunk/src/wp-admin/js/press-this.js 2015-03-04 21:00:52 UTC (rev 31613)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,20 +102,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function getCanonicalLink() {
</span><span class="cx" style="display: block; padding: 0 10px"> var link = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data._links ) {
- if ( data._links.canonical && data._links.canonical.length ) {
- link = data._links.canonical;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( data._links && data._links.canonical ) {
+ link = data._links.canonical;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! link.length && data.u ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! link && data.u ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> link = data.u;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! link.length && data._meta ) {
- if ( data._meta['twitter:url'] && data._meta['twitter:url'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! link && data._meta ) {
+ if ( data._meta['twitter:url'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> link = data._meta['twitter:url'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( data._meta['og:url'] && data._meta['og:url'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( data._meta['og:url'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> link = data._meta['og:url'];
</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">@@ -132,9 +130,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var name = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( data._meta ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data._meta['og:site_name'] && data._meta['og:site_name'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( data._meta['og:site_name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> name = data._meta['og:site_name'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( data._meta['application-name'] && data._meta['application-name'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( data._meta['application-name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> name = data._meta['application-name'];
</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">@@ -155,11 +153,11 @@
</span><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"> if ( ! title && data._meta ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data._meta['twitter:title'] && data._meta['twitter:title'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( data._meta['twitter:title'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> title = data._meta['twitter:title'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( data._meta['og:title'] && data._meta['og:title'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( data._meta['og:title'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> title = data._meta['og:title'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( data._meta.title && data._meta.title.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( data._meta.title ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> title = data._meta.title;
</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">@@ -185,14 +183,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> url = getCanonicalLink(),
</span><span class="cx" style="display: block; padding: 0 10px"> siteName = getSourceSiteName();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data.s && data.s.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( data.s ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> text = data.s;
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( data._meta ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data._meta['twitter:description'] && data._meta['twitter:description'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( data._meta['twitter:description'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> text = data._meta['twitter:description'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( data._meta['og:description'] && data._meta['og:description'].length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( data._meta['og:description'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> text = data._meta['og:description'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( data._meta.description && data._meta.description.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( data._meta.description ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> text = data._meta.description;
</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">@@ -222,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( embeds.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $.each( embeds, function ( i, src ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !src || !src.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! src ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Skip: no src value
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> src = src.replace( /http:\/\/[\d]+\.gravatar\.com\//, 'https://secure.gravatar.com/' );
</span><span class="cx" style="display: block; padding: 0 10px"> src = checkUrl( src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! src || ! src.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! src ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Skip: no src value
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> link = checkUrl( link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'img' === type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! link || ! link.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! link ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> link = src;
</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">@@ -480,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function renderStartupNotices() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Render errors sent in the data, if any
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( data.errors && data.errors.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( data.errors ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $.each( data.errors, function( i, msg ) {
</span><span class="cx" style="display: block; padding: 0 10px"> renderError( msg );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,7 +519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Render the suggested content, if any
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function renderSuggestedContent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! suggestedContentStr || ! suggestedContentStr.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! suggestedContentStr ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -547,11 +545,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> listContainer.empty();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( interestingEmbeds && interestingEmbeds.length ) || ( interestingImages && interestingImages.length ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( interestingEmbeds || interestingImages ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> listContainer.append( '<h2 class="screen-reader-text">' + __( 'allMediaHeading' ) + '</h2><ul class="wppt-all-media-list"/>' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( interestingEmbeds && interestingEmbeds.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( interestingEmbeds ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $.each( interestingEmbeds, function ( i, src ) {
</span><span class="cx" style="display: block; padding: 0 10px"> src = checkUrl( src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +578,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'class': cssClass,
</span><span class="cx" style="display: block; padding: 0 10px"> 'tabindex': '0'
</span><span class="cx" style="display: block; padding: 0 10px"> } ).css( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'background-image': ( displaySrc.length ) ? 'url(' + displaySrc + ')' : null
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'background-image': ( displaySrc ) ? 'url(' + displaySrc + ')' : null
</ins><span class="cx" style="display: block; padding: 0 10px"> } ).html(
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="screen-reader-text">' + __( 'suggestedEmbedAlt' ).replace( '%d', i + 1 ) + '</span>'
</span><span class="cx" style="display: block; padding: 0 10px"> ).on( 'click keypress', function ( e ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +591,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( interestingImages && interestingImages.length ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( interestingImages ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $.each( interestingImages, function ( i, src ) {
</span><span class="cx" style="display: block; padding: 0 10px"> src = checkUrl( src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,9 +746,7 @@
</span><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"> $selector.on( 'blur', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var textLength = $( this ).text().length;
-
- if ( ! textLength ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $( this ).text() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $placeholder.removeClass('is-hidden');
</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">@@ -805,7 +801,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Needs more work, doesn't detect when the other JS changes the value of #tax-input-post_tag
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#tax-input-post_tag' ).on( 'change', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var val = $( this ).val();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#post-option-tags' ).text( ( val.length ) ? val.replace( /,([^\s])/g, ', $1' ) : '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#post-option-tags' ).text( ( val ) ? val.replace( /,([^\s])/g, ', $1' ) : '' );
</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"> $( window ).on( 'beforeunload.press-this', function() {
</span></span></pre>
</div>
</div>
</body>
</html>