Use WP_Editor when editing or replying to comments, props ocean90, remove vendor specific selectors from editor-buttons.css, fixes #18348, see #17144

git-svn-id: http://svn.automattic.com/wordpress/trunk@18803 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-09-28 21:07:08 +00:00
parent fea5c38ef4
commit d58e337d24
12 changed files with 54 additions and 165 deletions

File diff suppressed because one or more lines are too long

View File

@ -87,8 +87,7 @@ body > #upload-menu {
#your-profile fieldset,
#rightnow,
div.dashboard-widget,
#dashboard-widgets p.dashboard-widget-links,
#replyrow #ed_reply_toolbar input {
#dashboard-widgets p.dashboard-widget-links {
border-color: #D1E5EE
}
@ -1612,25 +1611,11 @@ table.diff .diff-addedline ins {
background-image: linear-gradient(bottom, #eff8ff, #fff); /* proposed W3C Markup */
}
#replysubmit {
background-color: #f1f1f1;
border-top-color: #ddd;
}
#replyerror {
border-color: #ddd;
background-color: #f9f9f9;
}
#edithead,
#replyhead {
background-color: #f1f1f1;
}
#ed_reply_toolbar {
background-color: #e9e9e9;
}
/* table vim shortcuts */
.vim-current,
.vim-current th,
@ -1673,8 +1658,7 @@ div.star img {
/* inline editor */
.inline-edit-row fieldset input[type="text"],
.inline-edit-row fieldset textarea,
#bulk-titles,
#replyrow input {
#bulk-titles {
border-color: #ddd;
}
@ -1696,11 +1680,6 @@ div.star img {
background-color: #f1f1f1;
}
#replyrow #ed_reply_toolbar input:hover {
border-color: #aaa;
background: #ddd;
}
fieldset.inline-edit-col-right .inline-edit-col {
border-color: #dfdfdf;
}

File diff suppressed because one or more lines are too long

View File

@ -98,8 +98,7 @@ body > #upload-menu {
#your-profile fieldset,
#rightnow,
div.dashboard-widget,
#dashboard-widgets p.dashboard-widget-links,
#replyrow #ed_reply_toolbar input {
#dashboard-widgets p.dashboard-widget-links {
border-color: #ccc;
}
@ -1276,25 +1275,11 @@ table.diff .diff-addedline ins {
color: #D54E21;
}
#replysubmit {
background-color: #f1f1f1;
border-top-color: #ddd;
}
#replyerror {
border-color: #ddd;
background-color: #f9f9f9;
}
#edithead,
#replyhead {
background-color: #f1f1f1;
}
#ed_reply_toolbar {
background-color: #e9e9e9;
}
/* table vim shortcuts */
.vim-current,
.vim-current th,
@ -1342,8 +1327,7 @@ div.star img {
/* inline editor */
.inline-edit-row fieldset input[type="text"],
.inline-edit-row fieldset textarea,
#bulk-titles,
#replyrow input {
#bulk-titles {
border-color: #ddd;
}
@ -1365,11 +1349,6 @@ div.star img {
background-color: #f1f1f1;
}
#replyrow #ed_reply_toolbar input:hover {
border-color: #aaa;
background: #ddd;
}
fieldset.inline-edit-col-right .inline-edit-col {
border-color: #dfdfdf;
}

File diff suppressed because one or more lines are too long

View File

@ -4127,10 +4127,6 @@ span.imgedit-scale-warn {
}
/* reply to comments */
#replyrow {
font-size: 11px;
}
#replyrow input {
border-width: 1px;
border-style: solid;
@ -4140,14 +4136,10 @@ span.imgedit-scale-warn {
padding: 2px;
}
#replyrow .wp-editor-container {
border: 0 none;
}
#replysubmit {
margin: 0;
padding: 3px 7px;
text-align:center;
padding: 0 7px 3px;
text-align: center;
}
#replysubmit img.waiting,
@ -4162,20 +4154,17 @@ span.imgedit-scale-warn {
}
#replysubmit .error {
color:red;
line-height:21px;
text-align:center;
vertical-align:center;
color: red;
line-height: 21px;
text-align: center;
vertical-align: center;
}
#replyrow #editor-toolbar {
display: none;
}
#replyhead {
font-size: 12px;
font-weight: bold;
padding: 2px 10px 4px;
#replyrow h5 {
margin: .2em 0 0;
padding: 0 5px;
line-height: 1.4em;
font-size: 1em;
}
#edithead .inside {
@ -4183,12 +4172,10 @@ span.imgedit-scale-warn {
padding: 3px 0 2px 5px;
margin: 0;
text-align: center;
font-size: 11px;
}
#edithead .inside input {
width: 180px;
font-size: 11px;
}
#edithead label {
@ -4197,27 +4184,10 @@ span.imgedit-scale-warn {
#replycontainer {
padding: 5px;
border: 0 none;
height: 120px;
overflow: hidden;
position: relative;
}
#replycontent {
resize: none;
margin: 0;
width: 100%;
height: 100%;
padding: 0;
line-height: 150%;
border: 0 none;
outline: none;
font-size: 12px;
}
#replyrow #ed_reply_toolbar {
margin: 0;
padding: 2px 3px;
height: 120px;
}
.comment-ays {

View File

@ -311,7 +311,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
<?php else : ?>
<div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
<?php endif; ?>
<div id="replyhead" style="display:none;"><?php _e('Reply to Comment'); ?></div>
<div id="replyhead" style="display:none;"><h5><?php _e( 'Reply to Comment' ); ?></h5></div>
<div id="edithead" style="display:none;">
<div class="inside">
@ -331,7 +331,12 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
<div style="clear:both;"></div>
</div>
<div id="replycontainer"><textarea rows="8" cols="40" name="replycontent" tabindex="104" id="replycontent"></textarea></div>
<div id="replycontainer">
<?php
$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
?>
</div>
<p id="replysubmit" class="submit">
<a href="#comments-form" class="cancel button-secondary alignleft" tabindex="106"><?php _e('Cancel'); ?></a>

View File

@ -29,12 +29,19 @@ setCommentsList = function() {
$('span.pending-count').each( function() {
var a = $(this), n, dif;
n = a.html().replace(/[^0-9]+/g, '');
n = parseInt(n,10);
if ( isNaN(n) ) return;
n = parseInt(n, 10);
if ( isNaN(n) )
return;
dif = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
n = n + dif;
if ( n < 0 ) { n = 0; }
if ( n < 0 )
n = 0;
a.closest('.awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
updateCount(a, n);
dashboardTotals();
@ -368,7 +375,7 @@ commentReply = {
$('input', '#edithead').val('');
$('.error', '#replysubmit').html('').hide();
$('.waiting', '#replysubmit').hide();
$('#replycontainer, #replycontent').height(120);
$('#replycontent').css('height', '');
this.cid = '';
}
@ -388,8 +395,8 @@ commentReply = {
$('#comment_post_ID', editRow).val(p);
$('#comment_ID', editRow).val(id);
if ( h > 220 )
$('#replycontainer, #replycontent', editRow).height(h-104);
if ( h > 120 )
$('#replycontent', editRow).css('height', (35+h) + 'px');
if ( a == 'edit' ) {
$('#author', editRow).val( $('div.author', rowData).text() );
@ -543,8 +550,6 @@ $(document).ready(function(){
commentReply.init();
$(document).delegate('span.delete a.delete', 'click', function(){return false;});
if ( typeof QTags != 'undefined' )
quicktags({id: 'replycontent', buttons: 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close'});
if ( typeof $.table_hotkeys != 'undefined' ) {
make_hotkeys_redirect = function(which) {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -162,9 +162,7 @@
cursor: default;
padding: 1px 2px;
margin: 1px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
-khtml-border-radius: 2px;
border-radius: 2px;
-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
@ -215,13 +213,9 @@
text-align: left;
text-decoration: none;
width: 70px;
-moz-border-bottom-left-radius: 2px;
-webkit-border-bottom-left-radius: 2px;
-khtml-border-bottom-left-radius: 2px;
border-bottom-left-radius: 2px;
-moz-border-top-left-radius: 2px;
-webkit-border-top-left-radius: 2px;
-khtml-border-top-left-radius: 2px;
border-bottom-left-radius: 2px;
border-top-left-radius: 2px;
-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
@ -243,13 +237,9 @@
height: 20px;
border-collapse: separate;
padding: 1px;
-moz-border-bottom-left-radius: 0;
-webkit-border-bottom-left-radius: 0;
-khtml-border-bottom-left-radius: 0;
border-bottom-left-radius: 0;
-moz-border-top-left-radius: 0;
-webkit-border-top-left-radius: 0;
-khtml-border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
-moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.15), inset 0 0 2px 1px #fff;
@ -309,13 +299,9 @@
.wp_themeSkin table.mceSplitButton td {
padding: 2px;
-moz-border-bottom-left-radius: 0;
-webkit-border-bottom-left-radius: 0;
-khtml-border-bottom-left-radius: 0;
border-bottom-left-radius: 0;
-moz-border-top-left-radius: 0;
-webkit-border-top-left-radius: 0;
-khtml-border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
@ -363,25 +349,17 @@
.wp_themeSkin .mceListBox a.mceText,
.wp_themeSkin .mceSplitButton a.mceAction {
-moz-border-radius-bottomleft: 3px;
-webkit-border-bottom-left-radius: 3px;
-khtml-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px;
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
-khtml-border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
.wp_themeSkin .mceSplitButton a.mceOpen,
.wp_themeSkin .mceListBox a.mceOpen {
-moz-border-radius-bottomright: 3px;
-webkit-border-bottom-right-radius: 3px;
-khtml-border-bottom-right-radius: 3px;
border-bottom-right-radius: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
-khtml-border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
}
@ -1014,18 +992,15 @@
.wp-editor-container {
border-width: 1px;
border-style: solid;
-moz-border-radius: 3px 3px 0 0;
-webkit-border-top-right-radius: 3px;
-webkit-border-top-left-radius: 3px;
-khtml-border-top-right-radius: 3px;
-khtml-border-top-left-radius: 3px;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
border-color: #ccc #ccc #dfdfdf;
}
.wp-editor-container textarea.wp-editor-area {
width: 100%;
width: 99.9%;
}
.quicktags-toolbar,
@ -1048,11 +1023,8 @@
cursor: pointer;
border-width: 1px;
border-style: solid;
-moz-border-radius: 3px 3px 0 0;
-webkit-border-top-right-radius: 3px;
-webkit-border-top-left-radius: 3px;
-khtml-border-top-right-radius: 3px;
-khtml-border-top-left-radius: 3px;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
background-color: #f1f1f1;
@ -1098,11 +1070,8 @@
.quicktags-toolbar {
border-bottom-style: solid;
border-bottom-width: 1px;
-moz-border-radius: 3px 3px 0 0;
-webkit-border-top-right-radius: 3px;
-webkit-border-top-left-radius: 3px;
-khtml-border-top-right-radius: 3px;
-khtml-border-top-left-radius: 3px;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
padding: 2px 3px 0;
@ -1121,8 +1090,6 @@
font: 12px/18px Arial,Helvetica,sans-serif normal;
color: #464646;
border: 1px solid #C3C3C3;
-moz-border-radius: 3px;
-khtml-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
background-color: #eee;
@ -1170,8 +1137,6 @@
padding: 2px;
border-width: 1px;
border-style: solid;
-moz-border-radius: 3px;
-khtml-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
@ -1202,8 +1167,6 @@
#wp-link textarea {
border-width: 1px;
border-style: solid;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
font-size: 12px;
@ -1457,24 +1420,16 @@
.wp-dialog {
background-color: fff;
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
-khtml-border-top-left-radius: 4px;
border-top-left-radius: 4px;
-moz-border-radius-topright: 4px;
-webkit-border-top-right-radius: 4px;
-khtml-border-top-right-radius: 4px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.wp-dialog .ui-dialog-titlebar {
-moz-border-radius-topleft: 3px;
-webkit-border-top-left-radius: 3px;
-khtml-border-top-left-radius: 3px;
border-top-left-radius: 3px;
-moz-border-radius-topright: 3px;
-webkit-border-top-right-radius: 3px;
-khtml-border-top-right-radius: 3px;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
}
@ -1561,9 +1516,7 @@ RTL
background: #444444;
border-left: 1px solid #999;
border-top: 1px solid #999;
-moz-border-radius: 3px 0 0 0;
-webkit-border-top-left-radius: 3px;
-khtml-border-top-left-radius: 3px;
border-top-left-radius: 3px;
}
@ -1571,10 +1524,8 @@ RTL
background: #444444;
border-right: 1px solid #999;
border-top: 1px solid #999;
border-top-right-radius: 3px;
-khtml-border-top-right-radius: 3px;
-webkit-border-top-right-radius: 3px;
-moz-border-radius: 0 3px 0 0;
border-top-right-radius: 3px;
}
.clearlooks2 .mceMiddle .mceLeft {

View File

@ -296,7 +296,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429', 1 );
$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), '20110907', 1 );
$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), '20110928', 1 );
$scripts->add_script_data( 'admin-comments', 'adminCommentsL10n', array(
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
@ -432,13 +432,13 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110928a' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110928b' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20110927';
$colors_version = '20110928';
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
$styles->add( 'colors', true, array('wp-admin'), $colors_version );
@ -455,7 +455,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20110926' );
$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101224' );
$styles->add( 'editor-buttons', "/wp-includes/css/editor-buttons$suffix.css", array(), '20110802' );
$styles->add( 'editor-buttons', "/wp-includes/css/editor-buttons$suffix.css", array(), '20110928' );
$styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array(), '20110918' );
foreach ( $rtl_styles as $rtl_style ) {