aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/jqLite.js4
-rw-r--r--test/jqLiteSpec.js13
-rw-r--r--test/testabilityPatch.js2
3 files changed, 10 insertions, 9 deletions
diff --git a/src/jqLite.js b/src/jqLite.js
index d156ae6d..46e0a73c 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -647,14 +647,14 @@ forEach({
children: function(element) {
var children = [];
forEach(element.childNodes, function(element){
- if (element.nodeName != '#text')
+ if (element.nodeType === 1)
children.push(element);
});
return children;
},
contents: function(element) {
- return element.childNodes;
+ return element.childNodes || [];
},
append: function(element, node) {
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js
index b23e23eb..b1fa6b05 100644
--- a/test/jqLiteSpec.js
+++ b/test/jqLiteSpec.js
@@ -924,8 +924,8 @@ describe('jqLite', function() {
describe('children', function() {
- it('should select non-text children', function() {
- var root = jqLite('<div>').html('before-<div></div>after-<span></span>');
+ it('should only select element nodes', function() {
+ var root = jqLite('<div><!-- some comment -->before-<div></div>after-<span></span>');
var div = root.find('div');
var span = root.find('span');
expect(root.children()).toJqEqual([div, span]);
@@ -934,11 +934,12 @@ describe('jqLite', function() {
describe('contents', function() {
- it('should select all children nodes', function() {
- var root = jqLite('<div>').html('before-<div></div>after-<span></span>');
+ it('should select all types child nodes', function() {
+ var root = jqLite('<div><!-- some comment -->before-<div></div>after-<span></span></div>');
var contents = root.contents();
- expect(contents.length).toEqual(4);
- expect(jqLite(contents[0]).text()).toEqual('before-');
+ expect(contents.length).toEqual(5);
+ expect(contents[0].data).toEqual(' some comment ');
+ expect(contents[1].data).toEqual('before-');
});
});
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index ac22c72c..d55ff015 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -78,7 +78,7 @@ function dealoc(obj) {
function cleanup(element) {
element.unbind().removeData();
- for ( var i = 0, children = element.children() || []; i < children.length; i++) {
+ for ( var i = 0, children = element.contents() || []; i < children.length; i++) {
cleanup(jqLite(children[i]));
}
}