From 0faf95c3fc7bc3adca9903ecfe8141746d5ac279 Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Mon, 12 May 2014 15:39:34 +0430 Subject: [PATCH 1/8] HTML Supporting in Popover Add supporting for html in popover --- src/popover/popover.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/popover/popover.js b/src/popover/popover.js index 2bea0a3e10..e86d648d76 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -9,8 +9,15 @@ 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 == ture){ + markup = scope.content; + element.html(markup); + $compile(element.contents())(scope); + } + } }; }) From acb381dc1b2c093639fd218ed75078968b8f1b06 Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Mon, 12 May 2014 15:45:39 +0430 Subject: [PATCH 2/8] change @ with = --- src/popover/popover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popover/popover.js b/src/popover/popover.js index e86d648d76..f07062e667 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -9,7 +9,7 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) return { restrict: 'EA', replace: true, - scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',html:'@' }, + scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',html:'=' }, templateUrl: 'template/popover/popover.html', link:function(scope, element, attrs){ if(scope.html == ture){ From 6c7b8b106edeec1096e5ad15b020c85a4c0f9ab9 Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Mon, 12 May 2014 15:50:25 +0430 Subject: [PATCH 3/8] fixing space --- src/popover/popover.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/popover/popover.js b/src/popover/popover.js index f07062e667..04f4f63b74 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -9,12 +9,12 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) return { restrict: 'EA', replace: true, - scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',html:'=' }, + scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',html:'@' }, templateUrl: 'template/popover/popover.html', - link:function(scope, element, attrs){ - if(scope.html == ture){ - markup = scope.content; - element.html(markup); + link:function(scope, element, attrs){ + if(scope.html == ture){ + markup = scope.content; + element.html(markup); $compile(element.contents())(scope); } } From 866bfb833601896e7c5e61e90110aa00e061d4de Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Mon, 12 May 2014 15:50:53 +0430 Subject: [PATCH 4/8] fixing space --- src/popover/popover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popover/popover.js b/src/popover/popover.js index 04f4f63b74..8fc7bf2f09 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -17,7 +17,7 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) element.html(markup); $compile(element.contents())(scope); } - } + } }; }) From 9611249837a6998c75fda88e8681b60bee0782f1 Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Mon, 12 May 2014 15:55:30 +0430 Subject: [PATCH 5/8] fix space --- src/popover/popover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/popover/popover.js b/src/popover/popover.js index 8fc7bf2f09..41d13d0def 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -12,8 +12,8 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',html:'@' }, templateUrl: 'template/popover/popover.html', link:function(scope, element, attrs){ - if(scope.html == ture){ - markup = scope.content; + if(scope.html==ture){ + markup=scope.content; element.html(markup); $compile(element.contents())(scope); } From dc47f333074a5b5391671b4b2887e258096b7a01 Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Mon, 12 May 2014 16:08:15 +0430 Subject: [PATCH 6/8] fixing space --- src/popover/popover.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/popover/popover.js b/src/popover/popover.js index 41d13d0def..475ac5f959 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -11,13 +11,15 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) replace: true, scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&',html:'@' }, templateUrl: 'template/popover/popover.html', - link:function(scope, element, attrs){ - if(scope.html==ture){ - markup=scope.content; - element.html(markup); + link:function(scope, element, attrs) + { + if(scope.html == ture) + { + markup=scope.content; + element.html( markup ); $compile(element.contents())(scope); - } - } + } + } }; }) From 9c317554975e1a0a9aa7b19993bba07706da9ed5 Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Tue, 13 May 2014 21:17:26 +0330 Subject: [PATCH 7/8] Fixing some codes for passing test changing variable ture to true for passing test. now it support html in popover --- karma.conf.js | 2 +- src/popover/popover.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 475ac5f959..900f497068 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -13,7 +13,7 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) templateUrl: 'template/popover/popover.html', link:function(scope, element, attrs) { - if(scope.html == ture) + if(scope.html === true) { markup=scope.content; element.html( markup ); From 2e336833bbc26475e6145f7abdd376ad907f9799 Mon Sep 17 00:00:00 2001 From: Mohammad Bagher Ehtemam Date: Tue, 13 May 2014 21:39:27 +0330 Subject: [PATCH 8/8] add var keyword to variable --- src/popover/popover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popover/popover.js b/src/popover/popover.js index 900f497068..b386b0d71a 100644 --- a/src/popover/popover.js +++ b/src/popover/popover.js @@ -15,7 +15,7 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] ) { if(scope.html === true) { - markup=scope.content; + var markup=scope.content; element.html( markup ); $compile(element.contents())(scope); }