Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

feat(jqLite): implement the detach method #5461

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/jqLite.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
* - [`contents()`](http://api.jquery.com/contents/)
* - [`css()`](http://api.jquery.com/css/)
* - [`data()`](http://api.jquery.com/data/)
* - [`detach()`](http://api.jquery.com/detach/)
* - [`empty()`](http://api.jquery.com/empty/)
* - [`eq()`](http://api.jquery.com/eq/)
* - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name
Expand Down Expand Up @@ -368,6 +369,12 @@ function jqLiteEmpty(element) {
}
}

function jqLiteRemove(element, keepData) {
if (!keepData) jqLiteDealoc(element);
var parent = element.parentNode;
if (parent) parent.removeChild(element);
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I think, it will be convenient, if both remove and detach methods return removed node.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jQuery returns the original element with all the nodes so jqLite should do the same. This code is fine.


//////////////////////////////////////////
// Functions which are declared directly.
//////////////////////////////////////////
Expand Down Expand Up @@ -450,7 +457,7 @@ forEach({
return jqLiteInheritedData(element, '$injector');
},

removeAttr: function(element,name) {
removeAttr: function(element, name) {
element.removeAttribute(name);
},

Expand Down Expand Up @@ -796,10 +803,10 @@ forEach({
wrapNode.appendChild(element);
},

remove: function(element) {
jqLiteDealoc(element);
var parent = element.parentNode;
if (parent) parent.removeChild(element);
remove: jqLiteRemove,

detach: function(element) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't you want to support the keepData parameter here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This parameter is internal. jQuery accepts an optional selector argument so jqLite shouldn't use it for sth else.

This is OK for me.

jqLiteRemove(element, true);
},

after: function(element, newElement) {
Expand Down
24 changes: 24 additions & 0 deletions test/jqLiteSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,20 @@ describe('jqLite', function() {
}));


it('should keep data if an element is removed via detach()', function() {
var root = jqLite('<div><span>abc</span></div>'),
span = root.find('span'),
data = span.data();

span.data('foo', 'bar');
span.detach();

expect(data).toEqual({foo: 'bar'});

span.remove();
});


it('should retrieve all data if called without params', function() {
var element = jqLite(a);
expect(element.data()).toEqual({});
Expand Down Expand Up @@ -1301,6 +1315,16 @@ describe('jqLite', function() {
});


describe('detach', function() {
it('should detach', function() {
var root = jqLite('<div><span>abc</span></div>');
var span = root.find('span');
expect(span.detach()).toEqual(span);
expect(root.html()).toEqual('');
});
});


describe('after', function() {
it('should after', function() {
var root = jqLite('<div><span></span></div>');
Expand Down