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

htdocs/js/views.js

@@ -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));
                 }
             });

htdocs/theme/views-js.css

@@ -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;
 }