golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't show the Fullscreen button on the comment edit page, see #17136 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17966 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-05-19 07:34:54 +00:00
parent 3938bcc3e7
commit 96c6667c5c
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/edit-form-comment.php
View File

@ -120,7 +120,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
</div>
<div id="postdiv" class="postarea">
<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4, false); ?>
<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
</div>

2
wp-admin/js/edit-comments.dev.js
View File

@ -544,7 +544,7 @@ $(document).ready(function(){
$(document).delegate('span.delete a.delete', 'click', function(){return false;});
if ( typeof QTags != 'undefined' )
ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more');
ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more,fullscreen');
if ( typeof $.table_hotkeys != 'undefined' ) {
make_hotkeys_redirect = function(which) {

2
wp-admin/js/edit-comments.js
View File

File diff suppressed because one or more lines are too long

5
wp-includes/general-template.php
View File

@ -1786,7 +1786,7 @@ function wp_default_editor() {
* @param bool $media_buttons Optional, default is true. Whether to display media buttons.
* @param int $tab_index Optional, default is 2. Tabindex for textarea element.
*/
function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2) {
function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
$rows = get_option('default_post_edit_rows');
if (($rows < 3) || ($rows > 100))
$rows = 12;
@ -1839,12 +1839,13 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
?>
<script type="text/javascript">
edCanvas = document.getElementById('<?php echo $id; ?>');
<?php if ( ! $extended ) { ?> jQuery('#ed_fullscreen, #ed_more').hide();<?php } ?>
</script>
<?php
// queue scripts
if ( $richedit )
add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
else
elseif ( $extended )
add_action( 'admin_print_footer_scripts', 'wp_quicktags', 25 );
}

3
wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
View File

@ -35,9 +35,6 @@ font[face=mceinline] {font-family:inherit !important}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
/* WordPress styles */
html, body {
background-color: transparent;
}
.aligncenter,
dl.aligncenter {

2
wp-includes/script-loader.php
View File

@ -312,7 +312,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429' );
$scripts->add_data( 'admin-custom-fields', 'group', 1 );
$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110512' );
$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110518' );
$scripts->add_data( 'admin-comments', 'group', 1 );
$scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),