Revert and fix
This commit is contained in:
parent
3283386a1e
commit
3f66736fa9
|
@ -2,13 +2,12 @@ import $ from 'jquery';
|
|||
import _ from 'underscore';
|
||||
|
||||
export function togglePopover(show) {
|
||||
const $popover = $(this);
|
||||
const isAlreadyShown = $popover.hasClass('js-popover-show');
|
||||
const isAlreadyShown = this.hasClass('js-popover-show');
|
||||
if ((show && isAlreadyShown) || (!show && !isAlreadyShown)) {
|
||||
return false;
|
||||
}
|
||||
$popover.popover(show ? 'show' : 'hide');
|
||||
$popover.toggleClass('disable-animation js-popover-show', show);
|
||||
this.popover(show ? 'show' : 'hide');
|
||||
this.toggleClass('disable-animation js-popover-show', show);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,6 @@ describe('feature highlight', () => {
|
|||
mock = new MockAdapter(axios);
|
||||
mock.onGet('/test').reply(200);
|
||||
spyOn(window, 'addEventListener');
|
||||
spyOn(window, 'removeEventListener');
|
||||
featureHighlight.setupFeatureHighlightPopover('test', 0);
|
||||
});
|
||||
|
||||
|
@ -64,12 +63,7 @@ describe('feature highlight', () => {
|
|||
|
||||
it('setup show.bs.popover', () => {
|
||||
$(selector).trigger('show.bs.popover');
|
||||
expect(window.addEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function));
|
||||
});
|
||||
|
||||
it('setup hide.bs.popover', () => {
|
||||
$(selector).trigger('hide.bs.popover');
|
||||
expect(window.removeEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function));
|
||||
expect(window.addEventListener).toHaveBeenCalledWith('scroll', jasmine.any(Function), { once: true });
|
||||
});
|
||||
|
||||
it('removes disabled attribute', () => {
|
||||
|
|
Loading…
Reference in New Issue