fix(modal): revert focus behavior on open

ajpz · wesleycho · commit 8a4f625ef6cc · 2016-11-27T02:18:17.000-08:00
- On open, do not focus the first focusable element Closes angular-ui#6295
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -646,7 +646,6 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p
 
       $modalStack.modalRendered = function(modalInstance) {
         var modalWindow = openedWindows.get(modalInstance);
-        $modalStack.focusFirstFocusableElement($modalStack.loadFocusElementList(modalWindow));
         if (modalWindow) {
           modalWindow.value.renderDeferred.resolve();
         }
diff --git a/src/modal/test/modal.spec.js b/src/modal/test/modal.spec.js
@@ -526,7 +526,7 @@ describe('$uibModal', function() {
 
       var modal = open({template: '<div>Content<button>inside modal</button></div>'});
       $rootScope.$digest();
-      expect(document.activeElement.tagName).toBe('BUTTON');
+      expect(document.activeElement.className.split(' ')).toContain('modal');
       expect($document).toHaveModalsOpen(1);
 
       triggerKeyDown($document, 27);
@@ -698,7 +698,7 @@ describe('$uibModal', function() {
         $rootScope.$digest();
         $animate.flush();
 
-        expect(document.activeElement.tagName).toBe('INPUT');
+        expect(document.activeElement.className.split(' ')).toContain('modal');
 
         close(modal, 'closed ok');
 

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,6 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p`
`646`	`646`
`647`	`647`	`$modalStack.modalRendered = function(modalInstance) {`
`648`	`648`	`var modalWindow = openedWindows.get(modalInstance);`
`649`		`- $modalStack.focusFirstFocusableElement($modalStack.loadFocusElementList(modalWindow));`
`650`	`649`	`if (modalWindow) {`
`651`	`650`	`modalWindow.value.renderDeferred.resolve();`
`652`	`651`	`}`