diff --git a/karma.conf.js b/karma.conf.js index ed3d462618..546ccf403b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -27,7 +27,7 @@ exclude = [ // - Safari // - PhantomJS browsers = [ - 'Chrome' + 'C:/Program Files (x86)/Google/Chrome/Application/chrome.exe' ]; // test results reporter to use diff --git a/src/popover/popover.js b/src/popover/popover.js index 2bea0a3e10..b386b0d71a 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -9,8 +9,17 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) return { restrict: 'EA', replace: true, - scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&' }, - templateUrl: 'template/popover/popover.html' + scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',html:'@' }, + templateUrl: 'template/popover/popover.html', + link:function(scope, element, attrs) + { + if(scope.html === true) + { + var markup=scope.content; + element.html( markup ); + $compile(element.contents())(scope); + } + } }; })