Skip to content

Commit 6578bd0

Browse files
committed
chore: move getBlockElements to Angular.js
1 parent e19067c commit 6578bd0

File tree

4 files changed

+25
-36
lines changed

4 files changed

+25
-36
lines changed

src/.jshintrc

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
"assertArgFn": false,
100100
"assertNotHasOwnProperty": false,
101101
"getter": false,
102+
"getBlockElements": false,
102103

103104
/* AngularPublic.js */
104105
"version": false,

src/Angular.js

+24-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
-assertArg,
8080
-assertArgFn,
8181
-assertNotHasOwnProperty,
82-
-getter
82+
-getter,
83+
-getBlockElements
8384
8485
*/
8586

@@ -1318,3 +1319,25 @@ function getter(obj, path, bindFnToScope) {
13181319
}
13191320
return obj;
13201321
}
1322+
1323+
/**
1324+
* Return the siblings between `startNode` and `endNode`, inclusive
1325+
* @param {Object} object with `startNode` and `endNode` properties
1326+
* @returns jQlite object containing the elements
1327+
*/
1328+
function getBlockElements(block) {
1329+
if (block.startNode === block.endNode) {
1330+
return jqLite(block.startNode);
1331+
}
1332+
1333+
var element = block.startNode;
1334+
var elements = [element];
1335+
1336+
do {
1337+
element = element.nextSibling;
1338+
if (!element) break;
1339+
elements.push(element);
1340+
} while (element !== block.endNode);
1341+
1342+
return jqLite(elements);
1343+
}

src/ng/directive/ngIf.js

-18
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,4 @@ var ngIfDirective = ['$animate', function($animate) {
108108
};
109109
}
110110
};
111-
112-
// TODO(bford): this helper was copypasta'd from ngRepeat
113-
function getBlockElements(block) {
114-
if (block.startNode === block.endNode) {
115-
return jqLite(block.startNode);
116-
}
117-
118-
var element = block.startNode;
119-
var elements = [element];
120-
121-
do {
122-
element = element.nextSibling;
123-
if (!element) break;
124-
elements.push(element);
125-
} while (element !== block.endNode);
126-
127-
return jqLite(elements);
128-
}
129111
}];

src/ng/directive/ngRepeat.js

-17
Original file line numberDiff line numberDiff line change
@@ -393,22 +393,5 @@ var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
393393
};
394394
}
395395
};
396-
397-
function getBlockElements(block) {
398-
if (block.startNode === block.endNode) {
399-
return jqLite(block.startNode);
400-
}
401-
402-
var element = block.startNode;
403-
var elements = [element];
404-
405-
do {
406-
element = element.nextSibling;
407-
if (!element) break;
408-
elements.push(element);
409-
} while (element !== block.endNode);
410-
411-
return jqLite(elements);
412-
}
413396
}];
414397

0 commit comments

Comments
 (0)