Changeset 41598

Timestamp:

09/26/2017 08:23:07 AM (7 years ago)

Author:

swissspidy

Message:

Permalinks: Change structure tag button state more reliably.

Changes the highlighted tag buttons accordingly when selecting one of the commong permalink settings.

Deprecates options_permalink_add_js() as that JavaScript isn't added inline anymore.

Fixes #29872.

Location:

trunk/src/wp-admin

Files:

• includes/deprecated.php (modified) (1 diff)
• includes/options.php (modified) (1 diff)
• js/common.js (modified) (2 diffs)
• options-permalink.php (modified) (1 diff)

trunk/src/wp-admin/includes/deprecated.php

@@ -1492 +1492 @@
     }
 }
+
+/**
+ * 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
+}

trunk/src/wp-admin/includes/options.php

@@ -92 +92 @@
  * @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() {
 ?>

trunk/src/wp-admin/js/common.js

@@ -182 +182 @@
 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.
@@ -250 +270 @@
     }
 
-    $( '#custom_selection' ).prop( 'checked', true );
+    $permalinkCustomSelection.prop( 'checked', true );
 
     // Prepend and append slashes if necessary.

trunk/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();