From bd463c3c3a170e9c737cfdb52b620eaa8158c7b7 Mon Sep 17 00:00:00 2001
From: Wesley Cho <wesley.cho@gmail.com>
Date: Thu, 23 Jan 2014 19:45:01 -0500
Subject: [PATCH] Added support for popover-html directive for binding html

Modified tooltip to support new popoverHtml

Readded forgotten fix to prefix for popover-html

Switched to correct unsafe html binding directive

Refactored and added a flag that can be passed as an optional fourth value in $tooltip for unsafe html binding

Fix spec

Returned template setting to original location

Removed extra whitespace

Condensed test to one meaningful test of rendering properly

Changed the test

Fix up test

Hopefully the true test fix

Removed extra check
---
 src/popover/popover.js             | 13 ++++++++++++
 src/popover/test/popover.spec.js   | 33 ++++++++++++++++++++++++++++++
 src/tooltip/tooltip.js             | 12 +++++++++--
 template/popover/popover-html.html |  8 ++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 template/popover/popover-html.html

diff --git a/src/popover/popover.js b/src/popover/popover.js
index 2bea0a3e10..bcaabbe5a8 100644
--- a/src/popover/popover.js
+++ b/src/popover/popover.js
@@ -14,6 +14,19 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] )
   };
 })
 
+.directive( 'popoverHtmlPopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { title: '@', content: '=', placement: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/popover/popover-html.html'
+  };
+})
+
 .directive( 'popover', [ '$tooltip', function ( $tooltip ) {
   return $tooltip( 'popover', 'popover', 'click' );
+}])
+
+.directive( 'popoverHtml', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip( 'popoverHtml', 'popoverHtml', 'click', true );
 }]);
diff --git a/src/popover/test/popover.spec.js b/src/popover/test/popover.spec.js
index 7e6f2b3970..2bc6fa78df 100644
--- a/src/popover/test/popover.spec.js
+++ b/src/popover/test/popover.spec.js
@@ -68,4 +68,37 @@ describe('popover', function() {
   }));
 });
 
+describe('popoverHtml', function() {
+  var elm,
+      elmBody,
+      scope,
+      elmScope;
+
+  // load the popover code
+  beforeEach(module('ui.bootstrap.popover'));
+
+  // load the template
+  beforeEach(module('template/popover/popover-html.html'));
+
+  beforeEach(inject(function($rootScope, $compile) {
+    elmBody = angular.element(
+      '<div><span popover-html="html">Selector Text</span></div>'
+    );
+
+    scope = $rootScope;
+    scope.html = '<div>foo</div>';
+    $compile(elmBody)(scope);
+    scope.$digest();
+    elm = elmBody.find('span');
+    elmScope = elm.scope();
+  }));
+
+  it('should render properly', inject(function() {
+    // We can only test *that* the popover-html-popup element was created as the
+    // implementation is templated and replaced.
+    expect( elmBody.children().length ).toBe( 1 );
+  }));
+});
+
+
 
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
index 57c9cf09ee..0e858d7ea5 100644
--- a/src/tooltip/tooltip.js
+++ b/src/tooltip/tooltip.js
@@ -65,7 +65,7 @@ angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap
    * TODO support multiple triggers
    */
   this.$get = [ '$window', '$compile', '$timeout', '$parse', '$document', '$position', '$interpolate', function ( $window, $compile, $timeout, $parse, $document, $position, $interpolate ) {
-    return function $tooltip ( type, prefix, defaultTriggerShow ) {
+    return function $tooltip ( type, prefix, defaultTriggerShow, bindHtml ) {
       var options = angular.extend( {}, defaultOptions, globalOptions );
 
       /**
@@ -95,7 +95,15 @@ angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap
 
       var startSym = $interpolate.startSymbol();
       var endSym = $interpolate.endSymbol();
-      var template =
+      var template = bindHtml ?
+        '<div '+ directiveName +'-popup '+
+          'title="'+startSym+'tt_title'+endSym+'" '+
+          'content="tt_content" '+
+          'placement="'+startSym+'tt_placement'+endSym+'" '+
+          'animation="tt_animation" '+
+          'is-open="tt_isOpen"'+
+          '>'+
+        '</div>' :
         '<div '+ directiveName +'-popup '+
           'title="'+startSym+'tt_title'+endSym+'" '+
           'content="'+startSym+'tt_content'+endSym+'" '+
diff --git a/template/popover/popover-html.html b/template/popover/popover-html.html
new file mode 100644
index 0000000000..64ea9dea75
--- /dev/null
+++ b/template/popover/popover-html.html
@@ -0,0 +1,8 @@
+<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">
+  <div class="arrow"></div>
+
+  <div class="popover-inner">
+      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>
+      <div class="popover-content" bind-html-unsafe="content"></div>
+  </div>
+</div>