From 8c37865a46df302a364062e0bedc4c3eb8175f8d Mon Sep 17 00:00:00 2001
From: Chris Chua <chris.sirhc@gmail.com>
Date: Sat, 18 Apr 2015 23:43:42 -0700
Subject: [PATCH] feat(popover): 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 #3558
---
 src/popover/docs/demo.html                |  2 +-
 src/popover/popover.js                    |  6 ++++--
 src/popover/test/popover-template.spec.js | 16 +++++++++++++++-
 template/popover/popover-template.html    |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/popover/docs/demo.html b/src/popover/docs/demo.html
index b0dd4243e6..b4fcc087f0 100644
--- a/src/popover/docs/demo.html
+++ b/src/popover/docs/demo.html
@@ -14,7 +14,7 @@ <h4>Dynamic</h4>
     </div>
     <button popover="{{dynamicPopover.content}}" popover-title="{{dynamicPopover.title}}" class="btn btn-default">Dynamic Popover</button>
 
-    <button popover-template="{{dynamicPopover.templateUrl}}" popover-title="{{dynamicPopover.title}}" class="btn btn-default">Popover With Template</button>
+    <button popover-template="dynamicPopover.templateUrl" popover-title="{{dynamicPopover.title}}" class="btn btn-default">Popover With Template</button>
 
     <script type="text/ng-template" id="myPopoverTemplate.html">
         <div>{{dynamicPopover.content}}</div>
diff --git a/src/popover/popover.js b/src/popover/popover.js
index a64737b68e..4252be877e 100644
--- a/src/popover/popover.js
+++ b/src/popover/popover.js
@@ -9,14 +9,16 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] )
   return {
     restrict: 'EA',
     replace: true,
-    scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',
+    scope: { title: '@', contentExp: '&', placement: '@', animation: '&', isOpen: '&',
       originScope: '&' },
     templateUrl: 'template/popover/popover-template.html'
   };
 })
 
 .directive( 'popoverTemplate', [ '$tooltip', function ( $tooltip ) {
-  return $tooltip( 'popoverTemplate', 'popover', 'click' );
+  return $tooltip( 'popoverTemplate', 'popover', 'click', {
+    useContentExp: true
+  } );
 }])
 
 .directive( 'popoverPopup', function () {
diff --git a/src/popover/test/popover-template.spec.js b/src/popover/test/popover-template.spec.js
index cb504c28d9..1e74d31d5d 100644
--- a/src/popover/test/popover-template.spec.js
+++ b/src/popover/test/popover-template.spec.js
@@ -18,7 +18,7 @@ describe('popover template', function() {
 
   beforeEach(inject(function($rootScope, $compile) {
     elmBody = angular.element(
-      '<div><span popover-template="{{ templateUrl }}">Selector Text</span></div>'
+      '<div><span popover-template="templateUrl">Selector Text</span></div>'
     );
 
     scope = $rootScope;
@@ -62,5 +62,19 @@ describe('popover template', function() {
 
     expect( elmBody.children().eq(1).text().trim() ).toBe( 'new text' );
   }));
+
+  it('should hide popover when template becomes empty', inject(function ($timeout) {
+    elm.trigger( 'click' );
+    expect( tooltipScope.isOpen ).toBe( true );
+
+    scope.templateUrl = '';
+    scope.$digest();
+
+    expect( tooltipScope.isOpen ).toBe( false );
+
+    $timeout.flush();
+    expect( elmBody.children().length ).toBe( 1 );
+  }));
+
 });
 
diff --git a/template/popover/popover-template.html b/template/popover/popover-template.html
index 2d133729ed..91c12e143d 100644
--- a/template/popover/popover-template.html
+++ b/template/popover/popover-template.html
@@ -7,7 +7,7 @@
   <div class="popover-inner">
       <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>
       <div class="popover-content"
-        tooltip-template-transclude="content"
+        tooltip-template-transclude="contentExp()"
         tooltip-template-transclude-scope="originScope()"></div>
   </div>
 </div>