Skip to content
Browse files

Merge branch 'wip-mdl-30375-m20' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_20_STABLE
  • Loading branch information...
2 parents 0c6182c + 3ee4fb3 commit 2a71a2648ee528b2fe6ceaa65555308e9fcd5e55 @stronk7 stronk7 committed Nov 23, 2011
Showing with 3 additions and 1 deletion.
  1. +1 −1 blocks/comments/block_comments.php
  2. +2 −0 comment/comment.js
View
2 blocks/comments/block_comments.php
@@ -74,7 +74,7 @@ function get_content() {
$args->linktext = get_string('showcomments');
$args->notoggle = true;
$args->autostart = true;
- $args->displaycancel = true;
+ $args->displaycancel = false;
$comment = new comment($args);
$comment->set_view_permission(true);
View
2 comment/comment.js
@@ -58,6 +58,7 @@ M.core_comment = {
return false;
}, this);
}
+ scope.toggle_textarea(false);
CommentHelper.confirmoverlay = new Y.Overlay({
bodyContent: '<div class="comment-delete-confirm"><a href="#" id="confirmdelete-'+this.client_id+'">'+M.str.moodle.yes+'</a> <a href="#" id="canceldelete-'+this.client_id+'">'+M.str.moodle.no+'</a></div>',
visible: false
@@ -79,6 +80,7 @@ bodyContent: '<div class="comment-delete-confirm"><a href="#" id="confirmdelete-
var cid = scope.client_id;
var ta = Y.one('#dlg-content-'+cid);
ta.set('value', '');
+ scope.toggle_textarea(false);
var container = Y.one('#comment-list-'+cid);
var result = scope.render([obj], true);
var newcomment = Y.Node.create(result.html);

0 comments on commit 2a71a26

Please sign in to comment.
Something went wrong with that request. Please try again.