From 6458f4873d20e611d5a3510a8b15e9935e138458 Mon Sep 17 00:00:00 2001
From: Josh David Miller <josh@joshdmiller.com>
Date: Fri, 26 Apr 2013 12:41:01 -0700
Subject: [PATCH] fix($tooltip): fix positioning issues in tooltips and
 popovers

To calculate the relative position of the tooltip or popover, the
$tooltip service now uses the $position service, which resolves many
positioning bugs.

Closes #265, #115
---
 src/popover/docs/readme.md |  2 ++
 src/tooltip/docs/readme.md |  2 ++
 src/tooltip/tooltip.js     | 17 +++--------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/popover/docs/readme.md b/src/popover/docs/readme.md
index 05b1ecb89d..8b43c66c62 100644
--- a/src/popover/docs/readme.md
+++ b/src/popover/docs/readme.md
@@ -14,3 +14,5 @@ will display:
 - `popover-popup-delay`: For how long should the user have to have the mouse
   over the element before the popover shows (in milliseconds)? Defaults to 0.
 
+The popover directives require the `$position` service.
+
diff --git a/src/tooltip/docs/readme.md b/src/tooltip/docs/readme.md
index 306bd1f61f..ca8f1b4a73 100644
--- a/src/tooltip/docs/readme.md
+++ b/src/tooltip/docs/readme.md
@@ -16,3 +16,5 @@ will display:
 - `tooltip-popup-delay`: For how long should the user have to have the mouse
   over the element before the tooltip shows (in milliseconds)? Defaults to 0.
 
+The tooltip directives require the `$position` service.
+
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
index 1db5654fb7..c72484ce71 100644
--- a/src/tooltip/tooltip.js
+++ b/src/tooltip/tooltip.js
@@ -3,7 +3,7 @@
  * function, placement as a function, inside, support for more triggers than
  * just mouse enter/leave, html tooltips, and selector delegation.
  */
-angular.module( 'ui.bootstrap.tooltip', [] )
+angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position' ] )
 
 /**
  * The $tooltip service creates tooltip- and popover-like directives as well as
@@ -48,7 +48,7 @@ angular.module( 'ui.bootstrap.tooltip', [] )
    * Returns the actual instance of the $tooltip service.
    * TODO support multiple triggers
    */
-  this.$get = [ '$window', '$compile', '$timeout', '$parse', '$document', function ( $window, $compile, $timeout, $parse, $document ) {
+  this.$get = [ '$window', '$compile', '$timeout', '$parse', '$document', '$position', function ( $window, $compile, $timeout, $parse, $document, $position ) {
     return function $tooltip ( type, prefix, defaultTriggerShow, defaultTriggerHide ) {
       var options = angular.extend( {}, defaultOptions, globalOptions );
       var directiveName = snake_case( type );
@@ -63,17 +63,6 @@ angular.module( 'ui.bootstrap.tooltip', [] )
           '>'+
         '</'+ directiveName +'-popup>';
 
-      // Calculate the current position and size of the directive element.
-      function getPosition( element ) {
-        var boundingClientRect = element[0].getBoundingClientRect();
-        return {
-          width: element.prop( 'offsetWidth' ),
-          height: element.prop( 'offsetHeight' ),
-          top: boundingClientRect.top + $window.pageYOffset,
-          left: boundingClientRect.left + $window.pageXOffset
-        };
-      }
-          
       return {
         restrict: 'EA',
         scope: true,
@@ -148,7 +137,7 @@ angular.module( 'ui.bootstrap.tooltip', [] )
             }
             
             // Get the position of the directive element.
-            position = getPosition( element );
+            position = $position.position( element );
 
             // Get the height and width of the tooltip so we can center it.
             ttWidth = tooltip.prop( 'offsetWidth' );