sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PressThis: remove the extra .length tests for strings from press-this.js.

Browse Source 
Props stephdau, see #31373.

git-svn-id: https://develop.svn.wordpress.org/trunk@31613 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2015-03-04 21:00:52 +00:00
parent 5433303166
commit bd69086dcb
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/wp-admin/js/press-this.js
View File

@ -102,20 +102,18 @@
function getCanonicalLink() { function getCanonicalLink() {
var link = ''; var link = '';
if ( data._links ) { if ( data._links && data._links.canonical ) {
if ( data._links.canonical && data._links.canonical.length ) {
link = data._links.canonical; link = data._links.canonical;
} }
}
if ( ! link.length && data.u ) { if ( ! link && data.u ) {
link = data.u; link = data.u;
} }
if ( ! link.length && data._meta ) { if ( ! link && data._meta ) {
if ( data._meta['twitter:url'] && data._meta['twitter:url'].length ) { if ( data._meta['twitter:url'] ) {
link = data._meta['twitter:url']; link = data._meta['twitter:url'];
} else if ( data._meta['og:url'] && data._meta['og:url'].length ) { } else if ( data._meta['og:url'] ) {
link = data._meta['og:url']; link = data._meta['og:url'];
} }
} }
@ -132,9 +130,9 @@
var name = ''; var name = '';
if ( data._meta ) { if ( data._meta ) {
if ( data._meta['og:site_name'] && data._meta['og:site_name'].length ) { if ( data._meta['og:site_name'] ) {
name = data._meta['og:site_name']; name = data._meta['og:site_name'];
} else if ( data._meta['application-name'] && data._meta['application-name'].length ) { } else if ( data._meta['application-name'] ) {
name = data._meta['application-name']; name = data._meta['application-name'];
} }
} }
@ -155,11 +153,11 @@
} }
if ( ! title && data._meta ) { if ( ! title && data._meta ) {
if ( data._meta['twitter:title'] && data._meta['twitter:title'].length ) { if ( data._meta['twitter:title'] ) {
title = data._meta['twitter:title']; title = data._meta['twitter:title'];
} else if ( data._meta['og:title'] && data._meta['og:title'].length ) { } else if ( data._meta['og:title'] ) {
title = data._meta['og:title']; title = data._meta['og:title'];
} else if ( data._meta.title && data._meta.title.length ) { } else if ( data._meta.title ) {
title = data._meta.title; title = data._meta.title;
} }
} }
@ -185,14 +183,14 @@
url = getCanonicalLink(), url = getCanonicalLink(),
siteName = getSourceSiteName(); siteName = getSourceSiteName();
if ( data.s && data.s.length ) { if ( data.s ) {
text = data.s; text = data.s;
} else if ( data._meta ) { } else if ( data._meta ) {
if ( data._meta['twitter:description'] && data._meta['twitter:description'].length ) { if ( data._meta['twitter:description'] ) {
text = data._meta['twitter:description']; text = data._meta['twitter:description'];
} else if ( data._meta['og:description'] && data._meta['og:description'].length ) { } else if ( data._meta['og:description'] ) {
text = data._meta['og:description']; text = data._meta['og:description'];
} else if ( data._meta.description && data._meta.description.length ) { } else if ( data._meta.description ) {
text = data._meta.description; text = data._meta.description;
} }
} }
@ -222,7 +220,7 @@
if ( embeds.length ) { if ( embeds.length ) {
$.each( embeds, function ( i, src ) { $.each( embeds, function ( i, src ) {
if ( !src || !src.length ) { if ( ! src ) {
// Skip: no src value // Skip: no src value
return; return;
} }
@ -257,7 +255,7 @@
src = src.replace( /http:\/\/[\d]+\.gravatar\.com\//, 'https://secure.gravatar.com/' ); src = src.replace( /http:\/\/[\d]+\.gravatar\.com\//, 'https://secure.gravatar.com/' );
src = checkUrl( src ); src = checkUrl( src );
if ( ! src || ! src.length ) { if ( ! src ) {
// Skip: no src value // Skip: no src value
return; return;
} }
@ -369,7 +367,7 @@
link = checkUrl( link ); link = checkUrl( link );
if ( 'img' === type ) { if ( 'img' === type ) {
if ( ! link || ! link.length ) { if ( ! link ) {
link = src; link = src;
} }
@ -480,7 +478,7 @@
*/ */
function renderStartupNotices() { function renderStartupNotices() {
// Render errors sent in the data, if any // Render errors sent in the data, if any
if ( data.errors && data.errors.length ) { if ( data.errors ) {
$.each( data.errors, function( i, msg ) { $.each( data.errors, function( i, msg ) {
renderError( msg ); renderError( msg );
} ); } );
@ -521,7 +519,7 @@
* Render the suggested content, if any * Render the suggested content, if any
*/ */
function renderSuggestedContent() { function renderSuggestedContent() {
if ( ! suggestedContentStr || ! suggestedContentStr.length ) { if ( ! suggestedContentStr ) {
return; return;
} }
@ -547,11 +545,11 @@
listContainer.empty(); listContainer.empty();
if ( ( interestingEmbeds && interestingEmbeds.length ) || ( interestingImages && interestingImages.length ) ) { if ( interestingEmbeds || interestingImages ) {
listContainer.append( '<h2 class="screen-reader-text">' + __( 'allMediaHeading' ) + '</h2><ul class="wppt-all-media-list"/>' ); listContainer.append( '<h2 class="screen-reader-text">' + __( 'allMediaHeading' ) + '</h2><ul class="wppt-all-media-list"/>' );
} }
if ( interestingEmbeds && interestingEmbeds.length ) { if ( interestingEmbeds ) {
$.each( interestingEmbeds, function ( i, src ) { $.each( interestingEmbeds, function ( i, src ) {
src = checkUrl( src ); src = checkUrl( src );
@ -580,7 +578,7 @@
'class': cssClass, 'class': cssClass,
'tabindex': '0' 'tabindex': '0'
} ).css( { } ).css( {
'background-image': ( displaySrc.length ) ? 'url(' + displaySrc + ')' : null 'background-image': ( displaySrc ) ? 'url(' + displaySrc + ')' : null
} ).html( } ).html(
'<span class="screen-reader-text">' + __( 'suggestedEmbedAlt' ).replace( '%d', i + 1 ) + '</span>' '<span class="screen-reader-text">' + __( 'suggestedEmbedAlt' ).replace( '%d', i + 1 ) + '</span>'
).on( 'click keypress', function ( e ) { ).on( 'click keypress', function ( e ) {
@ -593,7 +591,7 @@
} ); } );
} }
if ( interestingImages && interestingImages.length ) { if ( interestingImages ) {
$.each( interestingImages, function ( i, src ) { $.each( interestingImages, function ( i, src ) {
src = checkUrl( src ); src = checkUrl( src );
@ -748,9 +746,7 @@
} ); } );
$selector.on( 'blur', function() { $selector.on( 'blur', function() {
var textLength = $( this ).text().length; if ( ! $( this ).text() ) {
if ( ! textLength ) {
$placeholder.removeClass('is-hidden'); $placeholder.removeClass('is-hidden');
} }
} ); } );
@ -805,7 +801,7 @@
// Needs more work, doesn't detect when the other JS changes the value of #tax-input-post_tag // Needs more work, doesn't detect when the other JS changes the value of #tax-input-post_tag
$( '#tax-input-post_tag' ).on( 'change', function() { $( '#tax-input-post_tag' ).on( 'change', function() {
var val = $( this ).val(); var val = $( this ).val();
$( '#post-option-tags' ).text( ( val.length ) ? val.replace( /,([^\s])/g, ', $1' ) : '' ); $( '#post-option-tags' ).text( ( val ) ? val.replace( /,([^\s])/g, ', $1' ) : '' );
} ); } );
$( window ).on( 'beforeunload.press-this', function() { $( window ).on( 'beforeunload.press-this', function() {