Merge branch 'master' into dev
This commit is contained in:
@@ -494,6 +494,10 @@ function public.set_item(item_id)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function public.item_set()
|
||||||
|
return private.item_id ~= nil
|
||||||
|
end
|
||||||
|
|
||||||
function public.update_item()
|
function public.update_item()
|
||||||
if private.item_id and not AuxItemSearchFrameItemItemInputBox:IsVisible() then
|
if private.item_id and not AuxItemSearchFrameItemItemInputBox:IsVisible() then
|
||||||
local info = { GetItemInfo(private.item_id) }
|
local info = { GetItemInfo(private.item_id) }
|
||||||
|
|||||||
@@ -65,9 +65,11 @@
|
|||||||
if this.selector.selected_value() then
|
if this.selector.selected_value() then
|
||||||
Aux.item_search_frame.set_item(this.selector.selected_value())
|
Aux.item_search_frame.set_item(this.selector.selected_value())
|
||||||
end
|
end
|
||||||
this:Hide()
|
if Aux.item_search_frame.item_set() then
|
||||||
this.selector.clear()
|
this:Hide()
|
||||||
Aux.item_search_frame.update_item()
|
this.selector.clear()
|
||||||
|
Aux.item_search_frame.update_item()
|
||||||
|
end
|
||||||
</OnEditFocusLost>
|
</OnEditFocusLost>
|
||||||
<OnEscapePressed>
|
<OnEscapePressed>
|
||||||
this.selector.clear()
|
this.selector.clear()
|
||||||
|
|||||||
+3
-1
@@ -329,7 +329,7 @@ function Aux.sell.validate_parameters()
|
|||||||
end
|
end
|
||||||
|
|
||||||
if MoneyInputFrame_GetCopper(AuxSellParametersBuyoutPrice) > 0 and MoneyInputFrame_GetCopper(AuxSellParametersStartPrice) > MoneyInputFrame_GetCopper(AuxSellParametersBuyoutPrice) then
|
if MoneyInputFrame_GetCopper(AuxSellParametersBuyoutPrice) > 0 and MoneyInputFrame_GetCopper(AuxSellParametersStartPrice) > MoneyInputFrame_GetCopper(AuxSellParametersBuyoutPrice) then
|
||||||
AuxSellParametersBuyoutPriceErrorText:Show()
|
-- AuxSellParametersBuyoutPriceErrorText:Show()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -357,6 +357,8 @@ function update_recommendation()
|
|||||||
AuxSellStackSize:SetNumber(0)
|
AuxSellStackSize:SetNumber(0)
|
||||||
AuxSellStackCountSlider:SetMinMaxValues(0,0)
|
AuxSellStackCountSlider:SetMinMaxValues(0,0)
|
||||||
AuxSellStackCount:SetNumber(0)
|
AuxSellStackCount:SetNumber(0)
|
||||||
|
|
||||||
|
MoneyFrame_Update('AuxSellParametersDepositMoneyFrame', 0)
|
||||||
else
|
else
|
||||||
AuxSellStackSize:SetNumber(current_auction.charges and AuxSellStackSizeSlider.charge_classes[AuxSellStackSizeSlider:GetValue()] or AuxSellStackSizeSlider:GetValue())
|
AuxSellStackSize:SetNumber(current_auction.charges and AuxSellStackSizeSlider.charge_classes[AuxSellStackSizeSlider:GetValue()] or AuxSellStackSizeSlider:GetValue())
|
||||||
AuxSellStackCount:SetNumber(AuxSellStackCountSlider:GetValue())
|
AuxSellStackCount:SetNumber(AuxSellStackCountSlider:GetValue())
|
||||||
|
|||||||
Reference in New Issue
Block a user