Skip to content
This repository has been archived by the owner on Nov 30, 2018. It is now read-only.

Commit

Permalink
Merge pull request #659 from Andrey-Gusakov/master
Browse files Browse the repository at this point in the history
fix for #658
  • Loading branch information
EisenbergEffect committed Nov 8, 2016
2 parents 51a1cdd + 4f9f25e commit 92bfbc6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/durandal/js/composition.js
Expand Up @@ -483,7 +483,7 @@ define(['durandal/system', 'durandal/viewLocator', 'durandal/binder', 'durandal/
context.composingNewView = true;
}

tryActivate(context, function () {
ko.ignoreDependencies(tryActivate, null, [context, function () {
if (context.parent.__composition_context == context) {
try {
delete context.parent.__composition_context;
Expand Down Expand Up @@ -535,7 +535,7 @@ define(['durandal/system', 'durandal/viewLocator', 'durandal/binder', 'durandal/
} else {
endComposition(context, element);
}
}, skipActivation, element);
}, skipActivation, element]);
},
/**
* Eecutes the default view location strategy.
Expand Down

0 comments on commit 92bfbc6

Please sign in to comment.