Changeset 41061

Timestamp:

07/15/2017 03:47:16 PM (9 years ago)

Author:

adamsilverstein

Message:

Move sanitizeText and stripTags from press this to wp.sanitize.

Introduce the wp.sanitize namespace and add two helpers for text sanitization. stripTags strips HTML tags from a string using regex.

Fixes #40635.

Location:

trunk/src

Files:

• wp-admin/js/press-this.js (modified) (4 diffs)
• wp-includes/js/utils.js (modified) (1 diff)
• wp-includes/js/wp-sanitize.js (added)
• wp-includes/script-loader.php (modified) (2 diffs)

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

@@ -9 +9 @@
                         $document             = $( document ),
                         saveAlert             = false,
-                        textarea              = document.createElement( 'textarea' ),
                         sidebarIsOpen         = false,
                         settings              = window.wpPressThisConfig || {},
@@ -57 +56 @@
 
                 /**
-                 * Strips HTML tags
-                 *
-                 * @param string string Text to have the HTML tags striped out of.
-                 * @returns string Stripped text.
-                 */
-                function stripTags( string ) {
-                        string = string || '';
-
-                        return string
-                                .replace( /<!--[\s\S]*?(-->|$)/g, '' )
-                                .replace( /<(script|style)[^>]*>[\s\S]*?(<\/\1>|$)/ig, '' )
-                                .replace( /<\/?[a-z][\s\S]*?(>|$)/ig, '' );
-                }
-
-                /**
-                 * Strip HTML tags and convert HTML entities.
-                 *
-                 * @param text string Text.
-                 * @returns string Sanitized text.
-                 */
-                function sanitizeText( text ) {
-                        var _text = stripTags( text );
-
-                        try {
-                                textarea.innerHTML = _text;
-                                _text = stripTags( textarea.value );
-                        } catch ( er ) {}
-
-                        return _text;
-                }
-
-                /**
                  * Allow only HTTP or protocol relative URLs.
                  *
@@ -98 +65 @@
 
                         if ( /^(?:https?:)?\/\//.test( url ) ) {
-                                url = stripTags( url );
+                                url = wp.sanitize.stripTags( url );
                                 return url.replace( /["\\]+/g, '' );
                         }
@@ -225 +192 @@
                         });
 
-                        return sanitizeText( $element.text() );
+                        return wp.sanitize.sanitizeText( $element.text() );
                 }
 

trunk/src/wp-includes/js/utils.js

@@ -196 +196 @@
         return wpCookies.getHash( 'wp-settings-' + userSettings.uid ) || {};
 }
+

trunk/src/wp-includes/script-loader.php

@@ -339 +339 @@
         ) );
 
+        $scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array('jquery'), false, 1 );
+
         $scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 );
 
@@ -577 +579 @@
                 ) );
 
-                $scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box' ), false, 1 );
+                $scripts->add( 'press-this', "/wp-admin/js/press-this$suffix.js", array( 'jquery', 'tags-box', 'wp-sanitize' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array(
                         'newPost' => __( 'Title' ),