Changeset 10525

Timestamp:

02/08/2009 01:38:02 PM (17 years ago)

Author:

azaozz

Message:

Fix permalink editor for pages, hide "View Post" button while editing permalink, fixes #9040

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (2 diffs)
• wp-admin/js/slug.dev.js (modified) (2 diffs)
• wp-admin/js/slug.js (modified) (1 diff)
• wp-includes/link-template.php (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -944 +944 @@
  * @return unknown
  */
-function get_sample_permalink_html($id, $new_title=null, $new_slug=null) {
+function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
     $post = &get_post($id);
     list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
@@ -951 +951 @@
     
     if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
-        if ( 'page' == $post->post_type )
-            return '';
-        
         $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $permalink . "</span>\n";
         $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";

trunk/wp-admin/js/slug.dev.js

@@ -2 +2 @@
     var i, c = 0, e = jQuery('#editable-post-name'), revert_e = e.html(), real_slug = jQuery('#post_name'), revert_slug = real_slug.html(), b = jQuery('#edit-slug-buttons'), revert_b = b.html(), full = jQuery('#editable-post-name-full').html();
 
-    b.html('<a href="" class="save button">'+slugL10n.save+'</a> <a class="cancel" href="">'+slugL10n.cancel+'</a>');
+    jQuery('#view-post-btn').hide();
+    b.html('<a href="#" class="save button">'+slugL10n.save+'</a> <a class="cancel" href="#">'+slugL10n.cancel+'</a>');
     b.children('.save').click(function() {
         var new_slug = e.children('input').val();
@@ -15 +16 @@
                 real_slug.attr('value', new_slug);
                 make_slugedit_clickable();
+                jQuery('#view-post-btn').show();
             });
         return false;
     });
     jQuery('#edit-slug-buttons .cancel').click(function() {
+        jQuery('#view-post-btn').show();
         e.html(revert_e);
         b.html(revert_b);

trunk/wp-admin/js/slug.js

@@ -1 @@
-function edit_permalink(a){var d,h=0,g=jQuery("#editable-post-name"),j=g.html(),m=jQuery("#post_name"),n=m.html(),k=jQuery("#edit-slug-buttons"),l=k.html(),f=jQuery("#editable-post-name-full").html();k.html('<a href="" class="save button">'+slugL10n.save+'</a> <a class="cancel" href="">'+slugL10n.cancel+"</a>");k.children(".save").click(function(){var b=g.children("input").val();jQuery.post(slugL10n.requestFile,{action:"sample-permalink",post_id:a,new_slug:b,new_title:jQuery("#title").val(),samplepermalinknonce:jQuery("#samplepermalinknonce").val()},function(c){jQuery("#edit-slug-box").html(c);k.html(l);m.attr("value",b);make_slugedit_clickable()});return false});jQuery("#edit-slug-buttons .cancel").click(function(){g.html(j);k.html(l);m.attr("value",n);return false});for(d=0;d<f.length;++d){if("%"==f.charAt(d)){h++}}slug_value=(h>f.length/4)?"":f;g.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(c){var b=c.charCode?c.charCode:c.keyCode?c.keyCode:0;if(13==b){k.children(".save").click();return false}if(27==b){k.children(".cancel").click();return false}m.attr("value",this.value)}).focus()}function make_slugedit_clickable(){jQuery("#editable-post-name").click(function(){jQuery("#edit-slug-buttons").children(".edit-slug").click()})};
+function edit_permalink(a){var d,h=0,g=jQuery("#editable-post-name"),j=g.html(),m=jQuery("#post_name"),n=m.html(),k=jQuery("#edit-slug-buttons"),l=k.html(),f=jQuery("#editable-post-name-full").html();jQuery("#view-post-btn").hide();k.html('<a href="#" class="save button">'+slugL10n.save+'</a> <a class="cancel" href="#">'+slugL10n.cancel+"</a>");k.children(".save").click(function(){var b=g.children("input").val();jQuery.post(slugL10n.requestFile,{action:"sample-permalink",post_id:a,new_slug:b,new_title:jQuery("#title").val(),samplepermalinknonce:jQuery("#samplepermalinknonce").val()},function(c){jQuery("#edit-slug-box").html(c);k.html(l);m.attr("value",b);make_slugedit_clickable();jQuery("#view-post-btn").show()});return false});jQuery("#edit-slug-buttons .cancel").click(function(){jQuery("#view-post-btn").show();g.html(j);k.html(l);m.attr("value",n);return false});for(d=0;d<f.length;++d){if("%"==f.charAt(d)){h++}}slug_value=(h>f.length/4)?"":f;g.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(c){var b=c.charCode?c.charCode:c.keyCode?c.keyCode:0;if(13==b){k.children(".save").click();return false}if(27==b){k.children(".cancel").click();return false}m.attr("value",this.value)}).focus()}function make_slugedit_clickable(){jQuery("#editable-post-name").click(function(){jQuery("#edit-slug-buttons").children(".edit-slug").click()})};

trunk/wp-includes/link-template.php

@@ -93 +93 @@
     );
 
-    if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter )
+    if ( is_object($id) && isset($id->filter) && 'sample' == $id->filter ) {
         $post = $id;
-    else
+        $sample = true;
+    } else {
         $post = &get_post($id);
+        $sample = false;
+    }
 
     if ( empty($post->ID) ) return false;
 
     if ( $post->post_type == 'page' )
-        return get_page_link($post->ID, $leavename);
+        return get_page_link($post->ID, $leavename, $sample);
     elseif ($post->post_type == 'attachment')
         return get_attachment_link($post->ID);
@@ -178 +181 @@
  *
  * @param int $id Optional. Post ID.
- * @param bool $leavename Optional, defaults to false. Whether to keep post name or page name.
- * @return string
- */
-function get_page_link($id = false, $leavename = false) {
+ * @param bool $leavename Optional, defaults to false. Whether to keep page name.
+ * @param bool $sample Optional, defaults to false. Is it a sample permalink.
+ * @return string
+ */
+function get_page_link( $id = false, $leavename = false, $sample = false ) {
     global $post;
 
@@ -191 +195 @@
         $link = get_option('home');
     else
-        $link = _get_page_link( $id , $leavename );
+        $link = _get_page_link( $id , $leavename, $sample );
 
     return apply_filters('page_link', $link, $id);
@@ -206 +210 @@
  * @param int $id Optional. Post ID.
  * @param bool $leavename Optional. Leave name.
- * @return string
- */
-function _get_page_link( $id = false, $leavename = false ) {
+ * @param bool $sample Optional. Sample permalink.
+ * @return string
+ */
+function _get_page_link( $id = false, $leavename = false, $sample = false ) {
     global $post, $wp_rewrite;
 
@@ -218 +223 @@
     $pagestruct = $wp_rewrite->get_page_permastruct();
 
-    if ( '' != $pagestruct && isset($post->post_status) && 'draft' != $post->post_status ) {
+    if ( '' != $pagestruct && ( ( isset($post->post_status) && 'draft' != $post->post_status ) || $sample ) ) {
         $link = get_page_uri($id);
         $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);

trunk/wp-includes/script-loader.php

@@ -241 +241 @@
         ) );
 
-        $scripts->add( 'slug', "/wp-admin/js/slug$suffix.js", array('jquery'), '20090102' );
+        $scripts->add( 'slug', "/wp-admin/js/slug$suffix.js", array('jquery'), '20090207' );
         $scripts->add_data( 'slug', 'group', 1 );
         $scripts->localize( 'slug', 'slugL10n', array(