Skip to content

Reverts back recent changes to the onAfterAction handler. #307

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

Merged
merged 1 commit into from
Apr 23, 2015
Merged

Reverts back recent changes to the onAfterAction handler. #307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 8 additions & 37 deletions angular-meteor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,44 +17,15 @@ var angularMeteor = angular.module('angular-meteor', [
angularMeteor.run(['$compile', '$document', '$rootScope', function ($compile, $document, $rootScope) {
// Recompile after iron:router builds page
if(typeof Router != 'undefined') {
var appLoaded = false;
Router.onAfterAction(function(req, res, next) {
// Since Router.current().ready() is reactive we wrap it in Tracker.nonreactive
// to avoid re-runs.
Tracker.nonreactive(function() {
Tracker.afterFlush(function() {
var route = Router.current();
if (route.ready()) {
// Since onAfterAction runs always twice when a route has waitOn's subscriptions,
// we need to handle case when data is already loaded at the moment
// Tracker.afterFlush executes which means it will run twice with
// Router.current().ready equals true.
// That's we save state to an additional auxiliry variable _done.
if (!route.state.get('__rendered')) {
// Checks if document's been compiled to the moment.
// If yes, compile only newly inserted parts.
if (route.state.get('__compiled')) {
for (var prop in route._layout._regions) {
var region = route._layout._regions[prop];
var node = region.view._domrange.firstNode();
while (node) {
$compile(node)($rootScope);
node = node.nextSibling;
}
}
} else {
$compile($document)($rootScope);
}
if (!$rootScope.$$phase) $rootScope.$apply();
route.state.set('__rendered', true);
}
} else {
// Compiles and applies scope for the first time when current route is not ready.
$compile($document)($rootScope);
if (!$rootScope.$$phase) $rootScope.$apply();
route.state.set('__compiled', true);
}
});
});
Tracker.afterFlush(function() {
if (!appLoaded) {
$compile($document)($rootScope);
if (!$rootScope.$$phase) $rootScope.$apply();
appLoaded = true;
}
})
});
}
}]);
Expand Down