feat(tooltip): use expression to fix usage with $sce

Allows for trusted resource URLs through Strict Contextual Escaping ($sce). If the an interpolated expression is used instead, then the benefits of SCE is lost. Fixes angular-ui#3558
chrisirhc · Apr 19, 2015 · 3d023bc · 3d023bc
1 parent 82cb637
commit 3d023bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/tooltip/docs/demo.html b/src/tooltip/docs/demo.html
@@ -20,7 +20,7 @@
       <a href="#" tooltip-animation="false" tooltip="I don't fade. :-(">fading</a>
       at elementum eu, facilisis sed odio morbi quis commodo odio. In cursus
       <a href="#" tooltip-popup-delay='1000' tooltip='appears with delay'>delayed</a> turpis massa tincidunt dui ut.
-      <a href="#" tooltip-template="myTooltipTemplate.html">Custom template</a>
+      <a href="#" tooltip-template="'myTooltipTemplate.html'">Custom template</a>
       nunc sed velit dignissim sodales ut eu sem integer vitae. Turpis egestas
     </p>
 

diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -466,7 +466,7 @@ function ($animate ,  $sce ,  $compile ,  $templateRequest) {
   return {
     restrict: 'EA',
     replace: true,
-    scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',
+    scope: { title: '@', contentExp: '&', placement: '@', animation: '&', isOpen: '&',
       originScope: '&' },
     templateUrl: 'template/tooltip/tooltip-template-popup.html'
   };

diff --git a/template/tooltip/tooltip-template-popup.html b/template/tooltip/tooltip-template-popup.html
@@ -4,6 +4,6 @@
   ng-class="{ in: isOpen() }">
   <div class="tooltip-arrow"></div>
   <div class="tooltip-inner"
-    tooltip-template-transclude="content"
+    tooltip-template-transclude="contentExp()"
     tooltip-template-transclude-scope="originScope()"></div>
 </div>