-
-
-
-
-
+
\ No newline at end of file
+?>
diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js
index 584eae34f6..0edd828984 100644
--- a/wp-admin/js/edit-comments.js
+++ b/wp-admin/js/edit-comments.js
@@ -29,7 +29,7 @@ setCommentsList = function() {
a.html( n.toString() );
});
};
-
+
var delAfter = function( r, settings ) {
$('li span.comment-count').each( function() {
var a = $(this);
@@ -67,17 +67,18 @@ setCommentsList = function() {
if ( n < 0 ) { n = 0; }
a.html( n.toString() );
});
-
+
if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
return;
}
-
+
theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
$('#get-extra-comments').submit();
};
theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } );
+
};
$(document).ready(function(){
@@ -86,77 +87,140 @@ $(document).ready(function(){
commentReply = {
- open : function(c, p) {
- var d = $('#comment-'+c).offset(), H = $('#replydiv').height(), top = 200, left = 100, h = 120;
+ init : function() {
+ this.rows = $('#the-comment-list tr');
+ var row = $('#replyrow');
- if ( d && H ) {
- top = (d.top - H) < 10 ? 10 : d.top - H - 5;
- left = d.left;
- }
+ $('a.cancel', row).click(function() { return commentReply.revert(); });
+ $('a.save', row).click(function() { return commentReply.send(this); });
- $('#replydiv #comment_post_ID').val(p);
- $('#replydiv #comment_ID').val(c);
+ // add events
+ this.addEvents(this.rows);
- $('#replydiv').draggable({
- handle : '#replyhandle',
- containment : '#wpwrap'
- }).resizable({
- handles : 'se',
- minHeight : 200,
- minWidth : 400,
- containment : '#wpwrap',
- resize : function(e,o) {
- h = o.size.height - 80 - $('#ed_reply_qtags').height();
- $('#replycontainer').height(h);
- },
- stop : function(e,o) {
- if ( $.browser.msie )
- $('#replycontent').height(h);
- }
+ $('#doaction, #doaction2, #post-query-submit').click(function(e){
+ if ( $('#the-comment-list #replyrow').length > 0 )
+ t.close();
});
- $('.ui-resizable-se').css({
- border: '0 none',
- width: '11px',
- height: '12px',
- background: 'transparent url(images/se.png) no-repeat scroll 0 0'
+ },
+
+ addEvents : function(r) {
+ r.each(function() {
+ $(this).dblclick(function(){
+ commentReply.toggle(this);
+ });
+ });
+ },
+
+ toggle : function(el) {
+ if ( $(el).css('display') != 'none' )
+ $(el).find('a.vim-q').click();
+ },
+
+ revert : function() {
+
+ if ( $('#the-comment-list #replyrow').length < 1 )
+ return false;
+
+ $('#replyrow').fadeOut('fast', function(){
+ commentReply.close();
});
- $('#replydiv').css({
- 'position' : 'absolute',
- 'top' : top,
- 'left' : left
- }).show();
-
- $('#replycontent').focus().keyup(function(e){
- if (e.which == 27) commentReply.close(); // close on Escape
- });
-
- // emulate the Safari/Opera scrollIntoView
- var to = $('#replydiv').offset();
- var scr = document.documentElement.scrollTop ? document.documentElement.scrollTop : 0;
-
- if ( scr - 20 > to.top )
- window.scroll(0, to.top - 100);
+ return false;
},
close : function() {
+ $(this.o).fadeIn('fast').css('backgroundColor', '');
+ $('#com-reply').append( $('#replyrow') );
$('#replycontent').val('');
- $('#replyerror').hide();
+ $('#edithead input').val('');
+ $('#replysubmit .error').html('').hide();
+ $('#replysubmit .waiting').hide();
+ if ( $.browser.msie )
+ $('#replycontainer, #replycontent').css('height', '120px');
+ else
+ $('#replycontainer').resizable('destroy').css('height', '120px');
+ },
+
+ open : function(id, p, a) {
+ var t = this;
+ t.close();
+ t.o = '#comment-'+id;
+
+ $('#replyrow td').attr('colspan', $('.widefat tfoot th:visible').length);
+ var editRow = $('#replyrow'), rowData = $('#inline-'+id);
+ var act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';
+
+ $('#action', editRow).val(act);
+ $('#comment_post_ID', editRow).val(p);
+ $('#comment_ID', editRow).val(id);
+
+ if ( a == 'edit' ) {
+ $('#author', editRow).val( $('div.author', rowData).text() );
+ $('#author-email', editRow).val( $('div.author-email', rowData).text() );
+ $('#author-url', editRow).val( $('div.author-url', rowData).text() );
+ $('#status', editRow).val( $('div.comment_status', rowData).text() );
+ $('#replycontent', editRow).val( $('textarea.comment', rowData).val() );
+ $('#edithead, #savebtn', editRow).show();
+ $('#replyhead, #replybtn', editRow).hide();
+
+ var h = $(t.o).height();
+ if ( h > 220 )
+ if ( $.browser.msie )
+ $('#replycontainer, #replycontent', editRow).height(h-105);
+ else
+ $('#replycontainer', editRow).height(h-105);
+
+ $(t.o).after(editRow.hide()).fadeOut('fast', function(){
+ $('#replyrow').fadeIn('fast');
+ });
+ } else {
+ $('#edithead, #savebtn', editRow).hide();
+ $('#replyhead, #replybtn', editRow).show();
+ $(t.o).after(editRow).animate( { backgroundColor: '#eefee7' }, 800);
+ $('#replyrow').hide().fadeIn('fast');
+ }
+
+ if ( ! $.browser.msie )
+ $('#replycontainer').resizable({
+ handles : 's',
+ axis : 'y',
+ minHeight : 80,
+ stop : function() {
+ $('#replycontainer').width('auto');
+ }
+ });
+
+ setTimeout(function() {
+ var rtop = $('#replyrow').offset().top;
+ var rbottom = rtop + $('#replyrow').height();
+ var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+ var vp = document.documentElement.clientHeight || self.innerHeight || 0;
+ var scrollBottom = scrollTop + vp;
+
+ if ( scrollBottom - 20 < rbottom )
+ window.scroll(0, rbottom - vp + 35);
+ else if ( rtop - 20 < scrollTop )
+ window.scroll(0, rtop - 35);
+
+ $('#replycontent').focus().keyup(function(e){
+ if (e.which == 27) commentReply.revert(); // close on Escape
+ });
+ }, 600);
- $('#replydiv').draggable('destroy').resizable('destroy').css('position','relative');
- $('#replydiv').hide();
return false;
},
send : function() {
var post = {};
- $('#replyform input').each(function() {
+ $('#replysubmit .waiting').show();
+
+ $('#replyrow input').each(function() {
post[ $(this).attr('name') ] = $(this).val();
});
- post.comment = $('#replycontent').val();
+ post.content = $('#replycontent').val();
post.id = post.comment_post_ID;
$.ajax({
@@ -166,72 +230,63 @@ commentReply = {
success : function(x) { commentReply.show(x); },
error : function(r) { commentReply.error(r); }
});
+
+ return false;
},
show : function(xml) {
if ( typeof(xml) == 'string' ) {
this.error({'responseText': xml});
- return;
+ return false;
}
var r = wpAjax.parseAjaxResponse(xml);
- if ( r.errors )
+ if ( r.errors ) {
this.error({'responseText': wpAjax.broken});
-
- r = r.responses[0];
- this.close();
-// var scr1 = $('#the-comment-list').offset(), scr2 = $('#the-comment-list').height();
-
- if ( r.position == -1 ) {
-// window.scroll(0, scr1.top - 100); // Scroll to the new comment? Seems annoing..
- $('#the-comment-list').prepend(r.data);
- } else {
-// window.scroll(0, scr1.top + scr2 + 200);
- $('#the-comment-list').append(r.data);
+ return false;
}
- $('#comment-'+r.id+' .hide-if-no-js').removeClass('hide-if-no-js');
+ if ( 'edit-comment' == this.act )
+ $(this.o).remove();
- $('#comment-'+r.id)
+ r = r.responses[0];
+ var c = r.data;
+
+ $(c).hide()
+ $('#replyrow').after(c);
+ this.o = id = '#comment-'+r.id;
+ $(id+' .hide-if-no-js').removeClass('hide-if-no-js');
+ this.revert();
+ this.addEvents($(id));
+
+ $(id)
.animate( { backgroundColor:"#CCEEBB" }, 600 )
.animate( { backgroundColor:"transparent" }, 600 );
-
+
+ theList = theExtraList = null;
+ $("#get-extra-comments, a[className*=':']").unbind();
setCommentsList();
+
},
error : function(r) {
var er = r.statusText;
+ $('#replysubmit .waiting').hide();
+
if ( r.responseText )
er = r.responseText.replace( /<.[^<>]*?>/g, '' );
- if ( er ) {
- var o = $('#replydiv').offset();
- $('#replydiv').hide();
+ if ( er )
+ $('#replysubmit .error').html(er).show();
- $('#replyerror').css({
- 'top' : o.top + 60 + 'px',
- 'left' : o.left + 'px'
- }).show().draggable();
-
- $('#replyerrtext').html(er)
- $('#close-button').css('outline','none').focus().keyup(function(e) {
- if (e.which == 27) commentReply.close(); // close on Escape
- });
- }
- },
-
- back : function() {
- if ( $('#replydiv').is(':hidden') && $('#replyerror').is(':visible') ) {
- $('#replyerror').hide();
- $('#replydiv').show();
- }
}
};
$(document).ready(function(){
columns.init('comment');
+ commentReply.init();
if ( typeof QTags != 'undefined' )
ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more');
@@ -239,7 +294,7 @@ $(document).ready(function(){
if ( typeof $.table_hotkeys != 'undefined' ) {
var make_hotkeys_redirect = function(which) {
return function() {
- var first_last = 'next' == which? 'first' : 'last';
+ var first_last = 'next' == which? 'first' : 'last';
var l=$('.'+which+'.page-numbers');
if (l.length)
window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
@@ -259,7 +314,7 @@ $(document).ready(function(){
$('form#comments-form')[0].submit();
}
};
- $.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', ['e', edit_comment],
+ $.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', 'q', ['e', edit_comment],
['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
['shift+d', make_bulk('delete')], ['shift+x', toggle_all]],
{highlight_first: adminCommentsL10n.hotkeys_highlight_first, highlight_last: adminCommentsL10n.hotkeys_highlight_last,
diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js
index 386cf5f3f5..403d5f5156 100644
--- a/wp-admin/js/inline-edit-post.js
+++ b/wp-admin/js/inline-edit-post.js
@@ -186,7 +186,7 @@ inlineEditPost = {
if( typeof(id) == 'object' )
id = this.getId(id);
- $('#edit-'+id+'.quick-edit-save').append('
');
+ $('table.widefat .quick-edit-save .waiting').show();
var params = {
action: 'inline-save',
@@ -225,6 +225,8 @@ inlineEditPost = {
var id;
if ( id = $('table.widefat tr.inline-editor').attr('id') ) {
+ $('table.widefat .quick-edit-save .waiting').hide();
+
if ( 'bulk-edit' == id ) {
$('table.widefat #bulk-edit').removeClass('inline-editor').hide();
$('#bulk-titles').html('');
diff --git a/wp-admin/js/inline-edit-tax.js b/wp-admin/js/inline-edit-tax.js
index 129b2fbd4c..1c9d048f10 100644
--- a/wp-admin/js/inline-edit-tax.js
+++ b/wp-admin/js/inline-edit-tax.js
@@ -90,7 +90,7 @@ inlineEditTax = {
if( typeof(id) == 'object' )
id = this.getId(id);
- $('#edit-'+id+'.quick-edit-save').append('
');
+ $('table.widefat .quick-edit-save .waiting').show();
var params = {
action: 'inline-save-tax',
@@ -126,6 +126,7 @@ inlineEditTax = {
var id = $('table.widefat tr.inline-editor').attr('id');
if ( id ) {
+ $('table.widefat .quick-edit-save .waiting').hide();
$('#'+id).remove();
id = id.substr( id.lastIndexOf('-') + 1 );
$(this.what+id).show();
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 39652d65e3..50ea85c7aa 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -329,8 +329,7 @@ textarea.all-options, input.all-options {
padding: 2px 4px;
}
-#ed_toolbar input,
-#ed_reply_toolbar input {
+#ed_toolbar input {
margin: 3px 2px 2px;
padding: 2px 4px;
line-height: 18px;
@@ -514,15 +513,6 @@ p.pagenav {
margin-top: 0;
}
-.column-comment {
- width: 50%;
-}
-
-.column-author,
-.column-response {
- width: 20%;
-}
-
.column-author img {
float: left;
margin-right: 10px;
@@ -1960,49 +1950,84 @@ a.togbox {
}
/* reply to comments */
-#replydiv {
- width: 700px;
- border-width: 1px;
- border-style: solid;
- padding: 2px;
- left: 20px;
- top: 200px;
- z-index: 100;
+#replyrow {
+ font-size: 11px;
}
-#replydiv #editorcontainer {
+#replyrow input {
+ border-width: 1px;
+ border-style: solid;
+}
+
+#replyrow td {
+ padding: 2px;
+}
+
+#replyrow #editorcontainer {
border: 0 none;
}
#replysubmit {
margin: 0;
- padding: 3px 5px;
+ padding: 5px;
border-top-width: 1px;
border-top-style: solid;
}
-#replysubmit .button,
-#replyerror .button {
+#replysubmit img.waiting,
+.quick-edit-save img.waiting {
+ padding: 0 10px;
+ vertical-align: top;
+}
+
+#replysubmit .button {
margin-right: 5px;
}
-#replydiv #editor-toolbar {
+#replyrow #editor-toolbar {
display: none;
}
-#replydiv #replyhandle {
- cursor: move;
- margin: 0;
- font-size: 14px;
+#replyhead {
+ font-size: 12px;
font-weight: bold;
- padding: 7px;
+ padding: 2px 10px 4px;
+}
+
+#edithead #edittitle {
+ float: left;
+ font-size: 12px;
+ font-weight: bold;
+ height: 20px;
+ line-height: 19px;
+ margin: 0 4px 0 0;
+ padding: 4px 10px;
+}
+
+#edithead .inside {
+ float: left;
+ margin: 0 4px 2px 0;
+ padding: 3px 0 2px;
+ text-align: center;
+ width: 260px;
+ font-size: 11px;
+}
+
+#edithead .inside input {
+ width: 200px;
+ font-size: 11px;
+}
+
+#edithead label {
+ padding: 2px;
}
#replycontainer {
- padding: 6px;
+ padding: 5px;
border: 0 none;
- height: 100%;
+ height: 120px;
overflow: hidden;
+ position: relative;
}
#replycontent {
@@ -2014,34 +2039,23 @@ a.togbox {
line-height: 150%;
border: 0 none;
outline: none;
+ font-size: 12px;
}
-#ed_reply_toolbar {
+#replyrow #ed_reply_toolbar {
margin: 0;
- padding: 2px 4px;
+ padding: 2px 3px;
}
-#replyerror {
- border-width: 5px;
- border-style: solid;
- position: absolute;
- padding: 15px 15px 10px;
- width: 500px;
- z-index: 1000;
- display: none;
-}
-
-#replyerror img {
- float: right;
- margin: 15px;
-}
-
-#replyerror p.submit {
- padding: 10px 0 0;
-}
-
-#replyerror .error {
- margin: 15px 0 0;
+#replyrow #ed_reply_toolbar input {
+ margin: 1px 2px 1px 1px;
+ min-width: 26px;
+ padding: 3px 4px;
+ font-size: 12px;
+ -moz-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
}
/* show/hide settings */
diff --git a/wp-includes/js/jquery/jquery.table-hotkeys.js b/wp-includes/js/jquery/jquery.table-hotkeys.js
index 0aa49368d6..6881e2a62f 100644
--- a/wp-includes/js/jquery/jquery.table-hotkeys.js
+++ b/wp-includes/js/jquery/jquery.table-hotkeys.js
@@ -65,7 +65,7 @@
}
};
var first_row = get_first_row();
- if (!first_row.length) return;
+ if (!first_row.length) return;
if (opts.highlight_first)
set_current_row(first_row);
else if (opts.highlight_last)
@@ -83,7 +83,7 @@
jQuery.hotkeys.add(key, opts.hotkeys_opts, make_key_callback('.'+opts.class_prefix+key));
}
});
-
+
};
$.table_hotkeys.current_row = null;
$.table_hotkeys.defaults = {cycle_expr: 'tr', class_prefix: 'vim-', selected_suffix: 'current',
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index bdb1d62b10..dbda27a520 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -158,7 +158,7 @@ function wp_default_scripts( &$scripts ) {
'good' => __('Medium'),
'strong' => __('Strong')
) );
- $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-draggable', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20080925' );
+ $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20081007' );
$scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
'pending' => __('%i% pending'), // must look like: "# blah blah"
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
@@ -242,12 +242,13 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
- $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20080930' );
+ $scripts->add( 'inline-edit-post', '/wp-admin/js/inline-edit-post.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081007' );
$scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
- 'edit' => __('Double-click to edit')
+ 'edit' => __('Double-click to edit'),
+ 'error' => __('Error while saving the changes.')
) );
- $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081003' );
+ $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081007' );
$scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
'edit' => __('Double-click to edit'),
'error' => __('Error while saving the changes.')