Skip to content

Allow any expression after 'track by ' #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fernandogmar wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow any expression after 'track by ' #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50ee9d8
allow any expression after 'track by '
fernandogmar Jun 4, 2018
5654d30
distribution files built wiht the last changes
fernandogmar Jun 4, 2018
9857e62
fix the regexp misspelling
fernandogmar Jun 4, 2018
07746c3
merge changes from original
fernandogmar Sep 11, 2019
e085676
adding support to ng-transclude on children
fernandogmar Sep 11, 2019
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
8 changes: 5 additions & 3 deletions dist/angular-vs-repeat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
ngRepeatExpression = _analyzeNgRepeatUsage2[1],
isNgRepeatStart = _analyzeNgRepeatUsage2[2];

var expressionMatches = /^\s*(\S+)\s+in\s+([\S\s]+?)(track\s+by\s+\S+)?$/.exec(ngRepeatExpression);
var expressionMatches = /^\s*(\S+)\s+in\s+([\S\s]+?)(track\s+by\s+.+)?$/.exec(ngRepeatExpression);

var _expressionMatches = _slicedToArray(expressionMatches, 4),
lhs = _expressionMatches[1],
Expand All @@ -222,7 +222,7 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i

compileRepeatContainer.empty();
return {
pre: function pre($scope, $element, $attrs) {
pre: function pre($scope, $element, $attrs, _controller, transclude) {
var _$scope$$eval;

function _parseSize(options) {
Expand Down Expand Up @@ -410,7 +410,9 @@ function _slicedToArray(arr, i) { if (Array.isArray(arr)) { return arr; } else i
childClone.addClass('vs-repeat-repeated-element');
repeatContainer.append($beforeContent);
repeatContainer.append(childClone);
$compile(childClone)($scope);
$compile(childClone)($scope, null, {
parentBoundTranscludeFn: transclude
});
repeatContainer.append($afterContent);
$scope.vsRepeat.startIndex = 0;
$scope.vsRepeat.endIndex = 0;
Expand Down
Loading