Skip to content
Snippets Groups Projects
Commit fee42b9d authored by baletiballo's avatar baletiballo
Browse files

Update WebViewController.cs

parent a41ace71
No related branches found
No related tags found
No related merge requests found
Pipeline #6546 passed
...@@ -95,15 +95,20 @@ private async void SetScrollContent(Scroll scroll) ...@@ -95,15 +95,20 @@ private async void SetScrollContent(Scroll scroll)
var slotId = match.Groups[2].Value; var slotId = match.Groups[2].Value;
var assignment = SwitchScrollUI.activeScrollData.Assignments[slotId]; var assignment = SwitchScrollUI.activeScrollData.Assignments[slotId];
/** label of the assigned fact, or the slot label if nothing assigned */ /** label of the assigned fact, or the slot label if nothing assigned */
var label = assignment.IsSet ? assignment.fact.GetLabel(StageStatic.stage.factState) : scroll.requiredFacts.Find(fact => fact.@ref.uri == slotId).label; var label = assignment.IsSet ? assignment.fact.GetLabel(StageStatic.stage.factState)
return $"<mi dropzone='copy' data-slot-id='{slotId}' {(assignment.IsSet ? $"data-fact-id='{assignment.fact.Id}'" : "")} {extraAttributes}>{label}</mi>"; : scroll.requiredFacts.Find(fact => fact.@ref.uri == slotId).label;
/** id of the assigned fact. If nothing is assigned don't add the attribute */
var fact_id = assignment.IsSet ? $"data-fact-id='{assignment.fact.Id}'"
: "";
return $"<mi dropzone='copy' data-slot-id='{slotId}' {fact_id} {extraAttributes}>{label}</mi>";
}); });
// replace solution templates // replace solution templates
description = Regex.Replace(description, "<scroll-solution([^>]*)>([^<]*)</scroll-solution>", match => description = Regex.Replace(description, "<scroll-solution([^>]*)>([^<]*)</scroll-solution>", match =>
{ {
var extraAttributes = match.Groups[1].Value; var extraAttributes = match.Groups[1].Value;
var solutionId = match.Groups[2].Value; var solutionId = match.Groups[2].Value;
return $"<mi data-solution-id='{solutionId}' {extraAttributes}>{scroll.acquiredFacts.Find(fact => fact.@ref.uri == solutionId).label}</mi>"; var label = scroll.acquiredFacts.Find(fact => fact.@ref.uri == solutionId).label;
return $"<mi data-solution-id='{solutionId}' {extraAttributes}>{label}</mi>";
}); });
} }
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment