Merge pull request #2308 from magento-obsessive-owls/cms-team-1-delivery-sprint-4

[CMS Team 1] Sprint 4

Author: cpartica

app/code/Magento/Ui/view/base/web/js/form/element/url-input.js

@@ -133,7 +133,7 @@ define([
         createChildUrlInputComponent: function (value) {
             var elementConfig;
 
-            if (_.isUndefined(this.linkedElementInstances[value])) {
+            if (!_.isEmpty(value) && _.isUndefined(this.linkedElementInstances[value])) {
                 elementConfig = this.urlTypes[value];
                 layout([elementConfig]);
                 this.linkedElementInstances[value] = this.requestModule(elementConfig.name);

app/code/Magento/Ui/view/base/web/js/lib/key-codes.js

@@ -20,6 +20,9 @@ define([], function () {
         39: 'pageRightKey',
         17: 'ctrlKey',
         18: 'altKey',
-        16: 'shiftKey'
+        16: 'shiftKey',
+        66: 'bKey',
+        73: 'iKey',
+        85: 'uKey'
     };
 });

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MAGETWO-72095"/>
             <group value="customer"/>
             <group value="create"/>
+            <group value="skip"/>
         </annotations>
         <after>
             <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>

lib/web/jquery/jstree/jquery.hotkeys.js

@@ -48,8 +48,12 @@
 
 		handleObj.handler = function( event ) {
 			// Don't fire in text-accepting inputs that we didn't directly bind to
+            /**
+             * Modified by Magento to ensure it doesn't fire on any content editable areas. This library is no
+             * longer maintained by its author however we require content editable to behave as expected.
+             */
 			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
-				 event.target.type === "text") ) {
+				 event.target.type === "text" || jQuery(event.target).attr('contenteditable')) ) {
 				return;
 			}