Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

Commit

Permalink
feat(popover): respect popover-class option
Browse files Browse the repository at this point in the history
Make this consistent with tooltips.
  • Loading branch information
chrisirhc committed Apr 30, 2015
1 parent 1d23ef3 commit 5f76fa0
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/popover/popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] )
return {
restrict: 'EA',
replace: true,
scope: { title: '@', contentExp: '&', placement: '@', animation: '&', isOpen: '&',
scope: { title: '@', contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
originScope: '&' },
templateUrl: 'template/popover/popover-template.html'
};
Expand All @@ -25,7 +25,7 @@ angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] )
return {
restrict: 'EA',
replace: true,
scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&' },
scope: { title: '@', content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
templateUrl: 'template/popover/popover.html'
};
})
Expand Down
49 changes: 49 additions & 0 deletions src/popover/test/popover-template.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,54 @@ describe('popover template', function() {
expect( elmBody.children().length ).toBe( 1 );
}));

describe('supports options', function () {

describe('placement', function () {

it('can specify an alternative, valid placement', inject(function ($compile) {
elmBody = angular.element(
'<div><span popover-template="templateUrl" popover-placement="left">Trigger</span></div>'
);
$compile(elmBody)(scope);
scope.$digest();
elm = elmBody.find('span');
elmScope = elm.scope();
tooltipScope = elmScope.$$childTail;

elm.trigger( 'click' );
expect( tooltipScope.isOpen ).toBe( true );

expect( elmBody.children().length ).toBe( 2 );
var ttipElement = elmBody.find('div.popover');
expect(ttipElement).toHaveClass('left');
}));

});

describe('class', function () {

it('can specify a custom class', inject(function ($compile) {
elmBody = angular.element(
'<div><span popover-template="templateUrl" popover-class="custom">Trigger</span></div>'
);
$compile(elmBody)(scope);
scope.$digest();
elm = elmBody.find('span');
elmScope = elm.scope();
tooltipScope = elmScope.$$childTail;

elm.trigger( 'click' );
expect( tooltipScope.isOpen ).toBe( true );

expect( elmBody.children().length ).toBe( 2 );
var ttipElement = elmBody.find('div.popover');
expect(ttipElement).toHaveClass('custom');
}));

});

});


});

48 changes: 48 additions & 0 deletions src/popover/test/popover.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,54 @@ describe('popover', function() {
expect(elmBody.children().eq(1)).not.toHaveClass('fade');
}));

describe('supports options', function () {

describe('placement', function () {

it('can specify an alternative, valid placement', inject(function ($compile) {
elmBody = angular.element(
'<div><span popover="popover text" popover-placement="left">Trigger here</span></div>'
);
$compile(elmBody)(scope);
scope.$digest();
elm = elmBody.find('span');
elmScope = elm.scope();
tooltipScope = elmScope.$$childTail;

elm.trigger( 'click' );
expect( tooltipScope.isOpen ).toBe( true );

expect( elmBody.children().length ).toBe( 2 );
var ttipElement = elmBody.find('div.popover');
expect(ttipElement).toHaveClass('left');
}));

});

describe('class', function () {

it('can specify a custom class', inject(function ($compile) {
elmBody = angular.element(
'<div><span popover="popover text" popover-class="custom">Trigger here</span></div>'
);
$compile(elmBody)(scope);
scope.$digest();
elm = elmBody.find('span');
elmScope = elm.scope();
tooltipScope = elmScope.$$childTail;

elm.trigger( 'click' );
expect( tooltipScope.isOpen ).toBe( true );

expect( elmBody.children().length ).toBe( 2 );
var ttipElement = elmBody.find('div.popover');
expect(ttipElement).toHaveClass('custom');
}));

});

});

});


0 comments on commit 5f76fa0

Please sign in to comment.