MDL-21944, remve ### link target

diff --git a/comment/comment.js b/comment/comment.js
index 1a5e3c3..d7a3ce0 100644 (file)
--- a/comment/comment.js
+++ b/comment/comment.js
@@ -55,7 +55,7 @@ M.core_comment = {
                     return false;
                 }, this);
                 CommentHelper.confirmoverlay = new Y.Overlay({
-bodyContent: '<a href="###" id="confirmdelete-'+this.client_id+'">'+M.str.moodle.sure+'</a> <a href="###" id="canceldelete-'+this.client_id+'">'+M.str.moodle.cancel+'</a>',
+bodyContent: '<a href="#" id="confirmdelete-'+this.client_id+'">'+M.str.moodle.sure+'</a> <a href="#" id="canceldelete-'+this.client_id+'">'+M.str.moodle.cancel+'</a>',
                                         visible: false
                                         });
                 CommentHelper.confirmoverlay.render(document.body);
@@ -168,7 +168,7 @@ bodyContent: '<a href="###" id="confirmdelete-'+this.client_id+'">'+M.str.moodle
                     var val = template.get('innerHTML');
                     val = val.replace('___name___', list[i].username);
                     if (list[i]['delete']||newcmt) {
-                        list[i].content = '<div class="comment-delete"><a href="###" id ="comment-delete-'+this.client_id+'-'+list[i].id+'" title="'+M.str.moodle.deletecomment+'"><img src="'+M.util.image_url('t/delete', 'core')+'" /></a></div>' + list[i].content;
+                        list[i].content = '<div class="comment-delete"><a href="#" id ="comment-delete-'+this.client_id+'-'+list[i].id+'" title="'+M.str.moodle.deletecomment+'"><img src="'+M.util.image_url('t/delete', 'core')+'" /></a></div>' + list[i].content;
                     }
                     val = val.replace('___time___', list[i].time);
                     val = val.replace('___picture___', list[i].avatar);
@@ -262,6 +262,7 @@ bodyContent: '<a href="###" id="confirmdelete-'+this.client_id+'">'+M.str.moodle
                             Y.Event.purgeElement('#'+theid, false, 'click');
                         }
                         node.on('click', function(e, node) {
+                                                       e.preventDefault();
                             var width = CommentHelper.confirmoverlay.bodyNode.getStyle('width');
                             var re = new RegExp("(\\d+).*", "i");
                             var result = width.match(re);
@@ -274,11 +275,13 @@ bodyContent: '<a href="###" id="confirmdelete-'+this.client_id+'">'+M.str.moodle
                             CommentHelper.confirmoverlay.set('visible', true);
                                                        // XXX: YUI3 bug, a temp workaround in firefox, still have problem on webkit
                                                        CommentHelper.confirmoverlay.bodyNode.setStyle('visibility', 'visible');
-                            Y.one('#canceldelete-'+scope.client_id).on('click', function() {
+                            Y.one('#canceldelete-'+scope.client_id).on('click', function(e) {
+                                                               e.preventDefault();
                                 scope.cancel_delete();
                                 });
                             Y.Event.purgeElement('#confirmdelete-'+scope.client_id, false, 'click');
-                            Y.one('#confirmdelete-'+scope.client_id).on('click', function() {
+                            Y.one('#confirmdelete-'+scope.client_id).on('click', function(e) {
+                                                                       e.preventDefault();
                                     if (commentid[1]) {
                                         scope.dodelete(commentid[1]);
                                     }
@@ -298,6 +301,7 @@ bodyContent: '<a href="###" id="confirmdelete-'+this.client_id+'">'+M.str.moodle
                 Y.all('#comment-pagination-'+this.client_id+' a').each(
                     function(node, id) {
                         node.on('click', function(e, node) {
+                                                       e.preventDefault();
                             var id = node.get('id');
                             var re = new RegExp("comment-page-"+this.client_id+"-(\\d+)", "i");
                             var result = id.match(re);
@@ -367,7 +371,7 @@ bodyContent: '<a href="###" id="confirmdelete-'+this.client_id+'">'+M.str.moodle
     },
     init_admin: function(Y) {
         var select_all = Y.one('#comment_select_all');
-        select_all.on('click', function() {
+        select_all.on('click', function(e) {
             var comments = document.getElementsByName('comments');
             var checked = false;
             for (var i in comments) {

diff --git a/comment/lib.php b/comment/lib.php
index b4358c9..62f366a 100644 (file)
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -336,12 +336,12 @@ EOD;
         <textarea name="content" rows="2" id="dlg-content-{$this->cid}"></textarea>
     </div>
     <div class="fd" id="comment-action-{$this->cid}">
-        <a href="###" id="comment-action-post-{$this->cid}"> {$strsubmit} </a>
+        <a href="#" id="comment-action-post-{$this->cid}"> {$strsubmit} </a>
 EOD;
         if ($this->env != 'block_comments') {
             $html .= <<<EOD
         <span> | </span>
-        <a href="###" id="comment-action-cancel-{$this->cid}"> {$strcancel} </a>
+        <a href="#" id="comment-action-cancel-{$this->cid}"> {$strcancel} </a>
 EOD;
         }
 
@@ -449,7 +449,7 @@ EOD;
                 } else {
                     $class = 'pageno';
                 }
-                $str .= '<a href="###" class="'.$class.'" id="comment-page-'.$this->cid.'-'.$p.'">'.($p+1).'</a> ';
+                $str .= '<a href="#" class="'.$class.'" id="comment-page-'.$this->cid.'-'.$p.'">'.($p+1).'</a> ';
             }
             $str .= '</div>';
         }
@@ -594,7 +594,7 @@ EOD;
         $replacements = array();
 
         if (!empty($cmt->delete) && empty($nonjs)) {
-            $cmt->content = '<div class="comment-delete"><a href="###" id ="comment-delete-'.$this->cid.'-'.$cmt->id.'"><img src="'.$OUTPUT->pix_url('t/delete').'" /></a></div>' . $cmt->content;
+            $cmt->content = '<div class="comment-delete"><a href="#" id ="comment-delete-'.$this->cid.'-'.$cmt->id.'"><img src="'.$OUTPUT->pix_url('t/delete').'" /></a></div>' . $cmt->content;
             // add the button
         }
         $patterns[] = '___picture___';