mirror of
https://github.com/zhigang1992/angular.js.git
synced 2026-04-23 19:40:56 +08:00
fix(jqLite): correctly monkey-patch core jQuery methods
When real jQuery is present, Angular monkey patch it to fire `$destroy` event. This commit fixes two issues in the jQuery patch: - passing a selector to the $.fn.remove method (only fire `$destroy` on the matched elements) - using `$.fn.html` without parameters as a getter (do not fire `$destroy`)
This commit is contained in:
committed by
Vojta Jina
parent
041f118b01
commit
da5f537ccd
@@ -49,9 +49,55 @@ if (window.jQuery) {
|
||||
doc.empty();
|
||||
});
|
||||
|
||||
it('should fire on html()', function() {
|
||||
it('should fire on html(param)', function() {
|
||||
doc.html('abc');
|
||||
});
|
||||
|
||||
it('should fire on html(\'\')', function() {
|
||||
doc.html('');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('jQuery patch eagerness', function() {
|
||||
|
||||
var doc = null;
|
||||
var divSpy = null;
|
||||
var spy1 = null;
|
||||
var spy2 = null;
|
||||
|
||||
beforeEach(function() {
|
||||
divSpy = jasmine.createSpy('div.$destroy');
|
||||
spy1 = jasmine.createSpy('span1.$destroy');
|
||||
spy2 = jasmine.createSpy('span2.$destroy');
|
||||
doc = $('<div><span class=first>abc</span><span class=second>xyz</span></div>');
|
||||
doc.find('span.first').bind('$destroy', spy1);
|
||||
doc.find('span.second').bind('$destroy', spy2);
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
expect(divSpy).not.toHaveBeenCalled();
|
||||
expect(spy1).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
describe('$detach event is not invoked in too many cases', function() {
|
||||
|
||||
it('should fire only on matched elements on detach(selector)', function() {
|
||||
doc.find('span').detach('.second');
|
||||
expect(spy2).toHaveBeenCalled();
|
||||
expect(spy2.callCount).toEqual(1);
|
||||
});
|
||||
|
||||
it('should fire only on matched elements on remove(selector)', function() {
|
||||
doc.find('span').remove('.second');
|
||||
expect(spy2).toHaveBeenCalled();
|
||||
expect(spy2.callCount).toEqual(1);
|
||||
});
|
||||
|
||||
it('should not fire on html()', function() {
|
||||
doc.html();
|
||||
expect(spy2).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user