Skip to content

Commit 413dffe

Browse files
committed
Revert "refactor(popover): switch to data-hidden instead of data-hide to follow bootstrap events"
This reverts commit 0b2026e.
1 parent e981346 commit 413dffe

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/directives/popover.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ angular.module('$strap.directives')
4848
});
4949
}
5050

51-
// Handle data-hidden attribute to toggle visibility
52-
if(!!attr.hidden) {
53-
scope.$watch(attr.hidden, function(newValue, oldValue) {
51+
// Handle data-hide attribute to toggle visibility
52+
if(!!attr.hide) {
53+
scope.$watch(attr.hide, function(newValue, oldValue) {
5454
if(!!newValue) {
5555
popover.hide();
5656
} else if(newValue !== oldValue) {

test/unit/directives/popoverSpec.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ describe('popover', function () {
3131
popover: 'Hello <span ng-bind-html-unsafe="content"></span>',
3232
element: '<a class="btn" bs-popover="\'partials/popover.html\'" data-title="aTitle" data-unique="1"></a>'
3333
},
34-
'hidden': {
35-
scope: {content: "World<br />Multiline Content<br />", foo: {hidden: false}},
34+
'hide': {
35+
scope: {content: "World<br />Multiline Content<br />", foo: {hide: false}},
3636
popover: 'Hello <span ng-bind-html-unsafe="content"></span>',
37-
element: '<a class="btn" bs-popover="\'partials/popover.html\'" data-title="aTitle" data-hidden="foo.hidden"></a>'
37+
element: '<a class="btn" bs-popover="\'partials/popover.html\'" data-title="aTitle" data-hide="foo.hide"></a>'
3838
},
3939
'object': {
4040
scope: {popover: {title: "aTitle", content: "World<br />Multiline Content<br />"}},
@@ -127,12 +127,12 @@ describe('popover', function () {
127127
//expect(elm.data('popover').tip().hasClass('in')).toBe(false);
128128
});
129129

130-
it('should support data-hidden attribute', function() {
131-
var elm = compileDirective('hidden');
130+
it('should support data-hide attribute', function() {
131+
var elm = compileDirective('hide');
132132
elm.trigger('click');
133133
expect(elm.data('popover').tip().hasClass('in')).toBe(true);
134-
scope.foo.hidden = true;
135-
scope.$digest();
134+
scope.foo.hide = true;
135+
scope.$digest(); // $digest already in progress
136136
expect(elm.data('popover').tip().hasClass('in')).toBe(false);
137137
});
138138

0 commit comments

Comments
 (0)