Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…dle into MOODLE_21_STABLE
  • Loading branch information...
commit 279fa1b994ac97f9e69e27a4b5552a8e9b49cf48 2 parents 6fe2462 + db90eb6
Eloy Lafuente (stronk7) authored November 23, 2011
2  blocks/comments/block_comments.php
@@ -74,7 +74,7 @@ function get_content() {
74 74
         $args->linktext  = get_string('showcomments');
75 75
         $args->notoggle  = true;
76 76
         $args->autostart = true;
77  
-        $args->displaycancel = true;
  77
+        $args->displaycancel = false;
78 78
         $comment = new comment($args);
79 79
         $comment->set_view_permission(true);
80 80
 
2  comment/comment.js
@@ -58,6 +58,7 @@ M.core_comment = {
58 58
                         return false;
59 59
                     }, this);
60 60
                 }
  61
+                scope.toggle_textarea(false);
61 62
                 CommentHelper.confirmoverlay = new Y.Overlay({
62 63
 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>',
63 64
                                         visible: false
@@ -79,6 +80,7 @@ bodyContent: '<div class="comment-delete-confirm"><a href="#" id="confirmdelete-
79 80
                             var cid = scope.client_id;
80 81
                             var ta = Y.one('#dlg-content-'+cid);
81 82
                             ta.set('value', '');
  83
+                            scope.toggle_textarea(false);
82 84
                             var container = Y.one('#comment-list-'+cid);
83 85
                             var result = scope.render([obj], true);
84 86
                             var newcomment = Y.Node.create(result.html);

0 notes on commit 279fa1b

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