Skip to content

Commit

Permalink
Build 13914
Browse files Browse the repository at this point in the history
  • Loading branch information
tekkub committed Apr 23, 2011
1 parent 0be4604 commit 7da4521
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions FrameXML/FriendsFrame.xml
Expand Up @@ -105,7 +105,7 @@
<Anchor point="TOPLEFT" relativeTo="$parentInfo" relativePoint="BOTTOMLEFT" x="20" y="-4"/>
</Anchors>
<Size>
<AbsDimension x="250" y="0"/>
<AbsDimension x="250" y="12"/>
</Size>
<Color r="0.345" g="0.667" b="0.867" />
</FontString>
Expand All @@ -116,7 +116,7 @@
<AbsDimension x="16" y="16"/>
</Size>
<Anchors>
<Anchor point="RIGHT" relativeTo="$parentBroadcastMessage" relativePoint="LEFT" x="-5" y="0"/>
<Anchor point="TOPRIGHT" relativeTo="$parentBroadcastMessage" relativePoint="TOPLEFT" x="-4" y="1"/>
</Anchors>
</Texture>
</Layer>
Expand Down
6 changes: 5 additions & 1 deletion FrameXML/HelpFrame.lua
Expand Up @@ -99,6 +99,7 @@ local ticketQueueActive = true;
local haveTicket = false; -- true if the server tells us we have an open ticket
local haveResponse = false; -- true if we got a GM response to a previous ticket
local needResponse = true; -- true if we want a GM to contact us when we open a new ticket (Note: This flag is always true right now)
local needMoreHelp = false;


--
Expand Down Expand Up @@ -236,9 +237,11 @@ function HelpFrame_GMResponse_Acknowledge(markRead)
haveResponse = false;
HelpFrame_SetTicketEntry();
if ( markRead ) then
needMoreHelp = false;
GMResponseResolve();
HelpFrame_ShowFrame(HELPFRAME_OPEN_TICKET);
else
needMoreHelp = true;
HelpFrame_ShowFrame(HELPFRAME_SUBMIT_TICKET);
end
end
Expand Down Expand Up @@ -349,8 +352,9 @@ function HelpFrameOpenTicketCancel_OnClick()
end

function HelpFrameOpenTicketSubmit_OnClick()
if ( haveResponse ) then
if ( needMoreHelp ) then
GMResponseNeedMoreHelp(HelpFrameOpenTicketEditBox:GetText());
needMoreHelp = false;
else
if ( haveTicket ) then
UpdateGMTicket(HelpFrameOpenTicketEditBox:GetText());
Expand Down

0 comments on commit 7da4521

Please sign in to comment.