Skip to content

Commit 4057c64

Browse files
committed
fix(gridUtil): Fixes gridUtil.off.mousewheel event handler
1 parent 026b6d2 commit 4057c64

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

src/js/core/services/ui-grid-util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ module.service('gridUtil', ['$log', '$window', '$document', '$http', '$templateC
12801280
}
12811281
};
12821282
s.off.mousewheel = function (elm, fn) {
1283-
var $elm = angular.element(this);
1283+
var $elm = angular.element(elm);
12841284

12851285
var cbs = $elm.data('mousewheel-callbacks');
12861286
var handler = cbs[fn];

test/unit/core/services/ui-grid-util.spec.js

+26
Original file line numberDiff line numberDiff line change
@@ -612,4 +612,30 @@ describe('ui.grid.utilService', function() {
612612
}).not.toThrow();
613613
});
614614
});
615+
616+
describe('on.mousewheel', function() {
617+
it('should register a callback on a dom element', function () {
618+
var div = document.createElement('div');
619+
var $div = angular.element(div);
620+
var callback = function(){};
621+
gridUtil.on.mousewheel(div, callback);
622+
expect(Object.keys($div.data('mousewheel-callbacks')).length).toEqual(1);
623+
});
624+
});
625+
626+
describe('off.mousewheel', function() {
627+
it('should deregister a callback on a dom element', function () {
628+
var div = document.createElement('div');
629+
var $div = angular.element(div);
630+
var callback1 = function(){return 1;};
631+
var callback2 = function(){return 2;};
632+
gridUtil.on.mousewheel(div, callback1);
633+
gridUtil.on.mousewheel(div, callback2);
634+
expect(Object.keys($div.data('mousewheel-callbacks')).length).toEqual(2);
635+
gridUtil.off.mousewheel(div, callback1);
636+
expect(Object.keys($div.data('mousewheel-callbacks')).length).toEqual(1);
637+
gridUtil.off.mousewheel(div, callback2);
638+
expect($div.data('mousewheel-callbacks')).toBe(undefined);
639+
});
640+
});
615641
});

0 commit comments

Comments
 (0)