feat(modal,tooltip): better focus support

mgcrea · Jan 19, 2014 · 6a960e4 · 6a960e4
1 parent 93d01e3
commit 6a960e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -102,7 +102,7 @@ angular.module('mgcrea.ngStrap.modal', ['mgcrea.ngStrap.helpers.dimensions'])
           // Options: show
           if(options.show) {
             scope.$$postDigest(function() {
-              $modal.show();
+              options.trigger === 'focus' ? element[0].focus() : $modal.show();
             });
           }
 

diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -113,7 +113,7 @@ angular.module('mgcrea.ngStrap.tooltip', ['mgcrea.ngStrap.helpers.dimensions'])
           // Options: show
           if(options.show) {
             scope.$$postDigest(function() {
-              $tooltip.show();
+              options.trigger === 'focus' ? element[0].focus() : $tooltip.show();
             });
           }