Merge "Bug 1733938: Allow 'ESC' key to cancel adding of a block"

htdocs/js/views.js

@@ -995,7 +995,7 @@
     function setupPositionBlockDialog() {
 
         $('#addblock .cancel, #addblock .deletebutton').on('mousedown keydown', function(e) {
-            if (isHit(e)) {
+            if (isHit(e) || e.keyCode === $j.ui.keyCode.ESCAPE) {
                 closePositionBlockDialog(e, {'saved': false});
             }
         });