Ticket #29872: 29872.6.diff

src/wp-admin/includes/deprecated.php

@@ -1490 +1490 @@
                 echo ' autocomplete="off"';
         }
 }
+
+/**
+ * Display JavaScript on the page.
+ *
+ * @since 3.5.0
+ * @deprecated 4.9.0
+ */
+function options_permalink_add_js() {
+        ?>
+        <script type="text/javascript">
+                jQuery(document).ready(function() {
+                        jQuery('.permalink-structure input:radio').change(function() {
+                                if ( 'custom' == this.value )
+                                        return;
+                                jQuery('#permalink_structure').val( this.value );
+                        });
+                        jQuery( '#permalink_structure' ).on( 'click input', function() {
+                                jQuery( '#custom_selection' ).prop( 'checked', true );
+                        });
+                });
+        </script>
+        <?php
+}

src/wp-admin/includes/options.php

@@ -91 +91 @@
  *
  * @since 3.5.0
  */
-function options_permalink_add_js() {
-        ?>
-<script type="text/javascript">
-jQuery(document).ready(function() {
-        jQuery('.permalink-structure input:radio').change(function() {
-                if ( 'custom' == this.value )
-                        return;
-                jQuery('#permalink_structure').val( this.value );
-        });
-        jQuery( '#permalink_structure' ).on( 'click input', function() {
-                jQuery( '#custom_selection' ).prop( 'checked', true );
-        });
-});
-</script>
-<?php
-}
-
-/**
- * Display JavaScript on the page.
- *
- * @since 3.5.0
- */
 function options_reading_add_js() {
 ?>
 <script type="text/javascript">

src/wp-admin/js/common.js

@@ -181 +181 @@
 
 var permalinkStructureFocused = false,
     $permalinkStructure       = $( '#permalink_structure' ),
+    $permalinkStructureInputs = $( '.permalink-structure input:radio' ),
+    $permalinkCustomSelection = $( '#custom_selection' ),
     $availableStructureTags   = $( '.form-table.permalink-structure .available-structure-tags button' );
 
+// Change permalink structure input when selecting one of the common structures.
+$permalinkStructureInputs.on( 'change', function() {
+        if ( 'custom' === this.value ) {
+                return;
+        }
+
+        $permalinkStructure.val( this.value );
+
+        // Update button states after selection.
+        $availableStructureTags.each( function() {
+                changeStructureTagButtonState( $( this ) );
+        } );
+} );
+
+$permalinkStructure.on( 'click input', function() {
+        $permalinkCustomSelection.prop( 'checked', true );
+} );
+
 // Check if the permalink structure input field has had focus at least once.
 $permalinkStructure.on( 'focus', function( event ) {
         permalinkStructureFocused = true;
@@ -249 +269 @@
                 selectionStart = selectionEnd = permalinkStructureValue.length;
         }
 
-        $( '#custom_selection' ).prop( 'checked', true );
+        $permalinkCustomSelection.prop( 'checked', true );
 
         // Prepend and append slashes if necessary.
         if ( '/' !== permalinkStructureValue.substr( 0, selectionStart ).substr( -1 ) ) {

src/wp-admin/options-permalink.php

@@ -46 +46 @@
         '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
-add_filter('admin_head', 'options_permalink_add_js');
-
 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
 $permalink_structure = get_option( 'permalink_structure' );