Commit 7203648b authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge "Fix adding extra block when clicking on blocktype (Bug #1283869)"

parents 7a32362d 91d6c8ee
......@@ -407,7 +407,7 @@
$('.blocktype-list div.blocktype').each(function() {
$(this).find('.blocktypelink').on('click keydown', function(e) {
var keyCode = $.ui.keyCode;
if (e.type == 'click' || e.keyCode == keyCode.SPACE || e.keyCode == keyCode.ENTER) {
if ((e.type == 'click' && e.buttons > 0) || e.keyCode == keyCode.SPACE || e.keyCode == keyCode.ENTER) {
startAddBlock($(this));
}
});
......
......@@ -8,9 +8,8 @@
* This file is licensed under the same terms as Mahara itself
*/
.blocktype,
.blocktype-clone {
cursor: move;
}
.blocktype-clone,
.blocktype *,
form .blockinstance-header {
cursor: move;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment