Changeset 31613

Timestamp:

03/04/2015 09:00:52 PM (10 years ago)

Author:

azaozz

Message:

PressThis: remove the extra .length tests for strings from press-this.js.
Props stephdau, see #31373.

File:

• trunk/src/wp-admin/js/press-this.js (modified) (14 diffs)

trunk/src/wp-admin/js/press-this.js

@@ -103 +103 @@
             var link = '';
 
-            if ( data._links ) {
-                if ( data._links.canonical && data._links.canonical.length ) {
-                    link = data._links.canonical;
-                }
-            }
-
-            if ( ! link.length && data.u ) {
+            if ( data._links && data._links.canonical ) {
+                link = data._links.canonical;
+            }
+
+            if ( ! link && data.u ) {
                 link = data.u;
             }
 
-            if ( ! link.length && data._meta ) {
-                if ( data._meta['twitter:url'] && data._meta['twitter:url'].length ) {
+            if ( ! link && data._meta ) {
+                if ( 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'];
                 }
@@ -133 +131 @@
 
             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'];
-                } else if ( data._meta['application-name'] && data._meta['application-name'].length ) {
+                } else if ( data._meta['application-name'] ) {
                     name = data._meta['application-name'];
                 }
@@ -156 +154 @@
 
             if ( ! title && data._meta ) {
-                if ( data._meta['twitter:title'] && data._meta['twitter:title'].length ) {
+                if ( 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'];
-                } else if ( data._meta.title && data._meta.title.length ) {
+                } else if ( data._meta.title ) {
                     title = data._meta.title;
                 }
@@ -186 +184 @@
                 siteName = getSourceSiteName();
 
-            if ( data.s && data.s.length ) {
+            if ( data.s ) {
                 text = data.s;
             } else if ( data._meta ) {
-                if ( data._meta['twitter:description'] && data._meta['twitter:description'].length ) {
+                if ( 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'];
-                } else if ( data._meta.description && data._meta.description.length ) {
+                } else if ( data._meta.description ) {
                     text = data._meta.description;
                 }
@@ -223 +221 @@
             if ( embeds.length ) {
                 $.each( embeds, function ( i, src ) {
-                    if ( !src || !src.length ) {
+                    if ( ! src ) {
                         // Skip: no src value
                         return;
@@ -258 +256 @@
                     src = checkUrl( src );
 
-                    if ( ! src || ! src.length ) {
+                    if ( ! src ) {
                         // Skip: no src value
                         return;
@@ -370 +368 @@
 
             if ( 'img' === type ) {
-                if ( ! link || ! link.length ) {
+                if ( ! link ) {
                     link = src;
                 }
@@ -481 +479 @@
         function renderStartupNotices() {
             // Render errors sent in the data, if any
-            if ( data.errors && data.errors.length ) {
+            if ( data.errors ) {
                 $.each( data.errors, function( i, msg ) {
                     renderError( msg );
@@ -522 +520 @@
          */
         function renderSuggestedContent() {
-            if ( ! suggestedContentStr || ! suggestedContentStr.length ) {
+            if ( ! suggestedContentStr ) {
                 return;
             }
@@ -548 +546 @@
             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"/>' );
             }
 
-            if ( interestingEmbeds && interestingEmbeds.length ) {
+            if ( interestingEmbeds ) {
                 $.each( interestingEmbeds, function ( i, src ) {
                     src = checkUrl( src );
@@ -581 +579 @@
                         'tabindex': '0'
                     } ).css( {
-                        'background-image': ( displaySrc.length ) ? 'url(' + displaySrc + ')' : null
+                        'background-image': ( displaySrc ) ? 'url(' + displaySrc + ')' : null
                     } ).html(
                         '<span class="screen-reader-text">' + __( 'suggestedEmbedAlt' ).replace( '%d', i + 1 ) + '</span>'
@@ -594 +592 @@
             }
 
-            if ( interestingImages && interestingImages.length ) {
+            if ( interestingImages ) {
                 $.each( interestingImages, function ( i, src ) {
                     src = checkUrl( src );
@@ -749 +747 @@
 
             $selector.on( 'blur', function() {
-                var textLength = $( this ).text().length;
-
-                if ( ! textLength ) {
+                if ( ! $( this ).text() ) {
                     $placeholder.removeClass('is-hidden');
                 }
@@ -806 +802 @@
             $( '#tax-input-post_tag' ).on( 'change', function() {
                 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' ) : '' );
             } );