mirror of
https://github.com/ZuneDev/MicrosoftIris.git
synced 2026-07-27 13:13:29 -07:00
Move NewMarkupLoad to when markup is completely loaded
This commit is contained in:
@@ -92,6 +92,8 @@ namespace Microsoft.Iris.Markup
|
|||||||
loadResult.Load(LoadPass.PopulatePublicModel);
|
loadResult.Load(LoadPass.PopulatePublicModel);
|
||||||
loadResult.Load(LoadPass.Full);
|
loadResult.Load(LoadPass.Full);
|
||||||
loadResult.Load(LoadPass.Done);
|
loadResult.Load(LoadPass.Done);
|
||||||
|
|
||||||
|
NewMarkupLoaded?.Invoke(null, loadResult);
|
||||||
}
|
}
|
||||||
ErrorManager.ExitContext();
|
ErrorManager.ExitContext();
|
||||||
return loadResult;
|
return loadResult;
|
||||||
@@ -137,8 +139,6 @@ namespace Microsoft.Iris.Markup
|
|||||||
if (loadResult.UnderlyingUri != null)
|
if (loadResult.UnderlyingUri != null)
|
||||||
LoadResultCache.Write(loadResult.UnderlyingUri, loadResult);
|
LoadResultCache.Write(loadResult.UnderlyingUri, loadResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
NewMarkupLoaded?.Invoke(null, loadResult);
|
|
||||||
}
|
}
|
||||||
loadResult?.AddReference(islandId);
|
loadResult?.AddReference(islandId);
|
||||||
ErrorManager.ExitContext();
|
ErrorManager.ExitContext();
|
||||||
|
|||||||
Reference in New Issue
Block a user