Fix #1266: Keyboard: Fix focus preservation edge case

(cherry picked from commit e7f4251)

Keyboard.js

@@ -432,6 +432,9 @@ define([
 				this._focusOnNode(node, false);
 			}
 			else {
+				if (this._removedFocus) {
+					this._removedFocus.active = true;
+				}
 				this.contentNode.focus();
 			}
 		}

test/intern/mixins/Keyboard.js

@@ -52,13 +52,14 @@ define([
 			handles[i].remove && handles[i].remove();
 		}
 		handles = [];
+
+		// Restore item that was removed for focus retention test
+		testStore.put(item);
 	}
 
 	function after() {
 		// Destroy list or grid
 		grid.destroy();
-		// Restore item that was removed for focus retention test
-		testStore.put(item);
 	}
 
 	// Common test functions for grid w/ cellNavigation: false and list
@@ -452,7 +453,6 @@ define([
 			assert.ok(element && element.className && element.className.indexOf('dgrid-cell') > -1,
 				'focus(id) call focused a cell');
 
-			// Focus the button we added to move focus out of the grid
 			button.focus();
 
 			nextElement = grid.cell(2, 'col1').element;
@@ -468,6 +468,31 @@ define([
 
 			return dfd;
 		});
+
+		test.test('grid.focus called in same turn after item removal', function () {
+			var dfd = this.async(1000),
+				element,
+				nextElement;
+
+			grid.focus(grid.cell(1, 'col1'));
+
+			element = document.activeElement;
+			assert.ok(element && element.className && element.className.indexOf('dgrid-cell') > -1,
+				'focus(id) call focused a cell');
+
+			button.focus();
+
+			nextElement = grid.cell(2, 'col1').element;
+			grid.collection.remove(1);
+			grid.focus();
+
+			setTimeout(dfd.callback(function () {
+				assert.strictEqual(nextElement, document.activeElement,
+					'The next row is focused after removing the item and calling focus on the same turn');
+			}), 0);
+
+			return dfd;
+		});
 	});
 
 	test.suite('Keyboard (Grid + cellNavigation:false)', function () {