Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing
2010-03-25 11:25:07 +00:00
parent 6dada0aa06
commit 3248a411b2
3 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PROMS/Volian.Controls.Library/DisplayText.cs
View File

@@ -429,7 +429,7 @@ namespace Volian.Controls.Library
Item itm2 = null;
if (dte.Type == E_TextElementType.TransitionRange)
{
itm2 = Item.Get(System.Convert.ToInt32(tparts[2]));
itm2 = Item.Get(System.Convert.ToInt32(tparts[3]));
}
else
itm2 = itm1;
@@ -711,7 +711,13 @@ namespace Volian.Controls.Library
if (link.IndexOf("<NewID>") != -1) return text;
int transitionID = Convert.ToInt32(link.Split(" ".ToCharArray())[1]);
// Find the transition
if (_MyItemInfo.MyContent.ContentTransitionCount <= 0) return "*Resolved Transition Text*";
if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
{
// TODO: RHM 20100310
_MyItemInfo.MyContent.RefreshContentTransitions();
if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
return "*Resolved Transition Text*";
}
foreach (TransitionInfo ti in _MyItemInfo.MyContent.ContentTransitions)
{
if (ti.TransitionID == transitionID)
@@ -771,7 +777,7 @@ namespace Volian.Controls.Library
{
if (vte.TextAndLink.Contains("(Resolved Transition Text)"))
vte.TextAndLink = vte.TextAndLink.Replace("(Resolved Transition Text)", tmptxt);
else
else
if (vte.Text != tmptxt)
vte.Text = tmptxt;
}