Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-08-29 13:44:18 +02:00
parent 4b8b0cd9d0
commit 2ea9a9d665
11 changed files with 126 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tabs/search/filter.lua
+15 -15
View File
@@ -72,14 +72,14 @@ function update_form()
end
if blizzard_query.exact then
for key in -temp-set('class', 'subclass', 'slot', 'quality') do
for key in temp-set('class', 'subclass', 'slot', 'quality') do
M[key..'_dropdown'].button:Disable()
end
else
class_dropdown.button:Enable()
quality_dropdown.button:Enable()
end
for key in -temp-set('min_level', 'max_level') do
for key in temp-set('min_level', 'max_level') do
if blizzard_query.exact then
M[key..'_input']:Disable()
else
@@ -134,7 +134,7 @@ function get_filter_builder_query()
add(strlower(_G['ITEM_QUALITY'..quality..'_DESC']))
end
local post_filter_string = filter_util.query_string(-temp-object('blizzard', tt, 'post', post_filter))
local post_filter_string = filter_util.query_string(temp-T('blizzard', tt, 'post', post_filter))
add(post_filter_string ~= '' and post_filter_string)
return query_string or ''
@@ -231,7 +231,7 @@ function data_link(id, str)
end
post_filter = t
filter_builder_state = -object('selected', 0)
filter_builder_state = T('selected', 0)
function data_link_click()
local button = arg3
@@ -313,8 +313,8 @@ function set_filter_display_offset(x_offset, y_offset)
end
function initialize_filter_dropdown()
for filter in -temp-set('and', 'or', 'not', 'min-unit-bid', 'min-unit-buy', 'max-unit-bid', 'max-unit-buy', 'bid-profit', 'buy-profit', 'bid-vend-profit', 'buy-vend-profit', 'bid-dis-profit', 'buy-dis-profit', 'bid-pct', 'buy-pct', 'item', 'tooltip', 'min-lvl', 'max-lvl', 'rarity')('left', 'utilizable', 'discard') do
UIDropDownMenu_AddButton(-object(
for filter in temp-set('and', 'or', 'not', 'min-unit-bid', 'min-unit-buy', 'max-unit-bid', 'max-unit-buy', 'bid-profit', 'buy-profit', 'bid-vend-profit', 'buy-vend-profit', 'bid-dis-profit', 'buy-dis-profit', 'bid-pct', 'buy-pct', 'item', 'tooltip', 'min-lvl', 'max-lvl', 'rarity')('left', 'utilizable', 'discard') do
UIDropDownMenu_AddButton(T(
'text', filter,
'value', filter,
'func', function()
@@ -343,9 +343,9 @@ function initialize_class_dropdown()
update_form()
end
end
UIDropDownMenu_AddButton(-object('text', ALL, 'value', 0, 'func', on_click))
UIDropDownMenu_AddButton(T('text', ALL, 'value', 0, 'func', on_click))
for i, class in temp-{GetAuctionItemClasses()} do
UIDropDownMenu_AddButton(-object('text', class, 'value', i, 'func', on_click))
UIDropDownMenu_AddButton(T('text', class, 'value', i, 'func', on_click))
end
end
@@ -360,9 +360,9 @@ function initialize_subclass_dropdown()
end
local class_index = UIDropDownMenu_GetSelectedValue(class_dropdown)
if class_index and GetAuctionItemSubClasses(class_index) then
UIDropDownMenu_AddButton(-object('text', ALL, 'value', 0, 'func', on_click))
for i, subclass in temp-{GetAuctionItemSubClasses(class_index)} do
UIDropDownMenu_AddButton(-object('text', subclass, 'value', i, 'func', on_click))
UIDropDownMenu_AddButton(T('text', ALL, 'value', 0, 'func', on_click))
for i, subclass in temp-list(GetAuctionItemSubClasses(class_index)) do
UIDropDownMenu_AddButton(T('text', subclass, 'value', i, 'func', on_click))
end
end
end
@@ -375,9 +375,9 @@ function initialize_slot_dropdown()
local class_index = UIDropDownMenu_GetSelectedValue(class_dropdown)
local subclass_index = UIDropDownMenu_GetSelectedValue(subclass_dropdown)
if subclass_index and GetAuctionInvTypes(class_index, subclass_index) then
UIDropDownMenu_AddButton(-object('text', ALL, 'value', '', 'func', on_click))
UIDropDownMenu_AddButton(T('text', ALL, 'value', '', 'func', on_click))
for _, slot in {GetAuctionInvTypes(class_index, subclass_index)} do
UIDropDownMenu_AddButton(-object('text', _G[slot], 'value', slot, 'func', on_click))
UIDropDownMenu_AddButton(T('text', _G[slot], 'value', slot, 'func', on_click))
end
end
end
@@ -387,8 +387,8 @@ function initialize_quality_dropdown()
UIDropDownMenu_SetSelectedValue(quality_dropdown, this.value)
update_form()
end
UIDropDownMenu_AddButton(-object('text', ALL, 'value', -1, 'func', on_click))
UIDropDownMenu_AddButton(T('text', ALL, 'value', -1, 'func', on_click))
for i = 0, 4 do
UIDropDownMenu_AddButton(-object('text', _G['ITEM_QUALITY'..i..'_DESC'], 'value', i, 'func', on_click))
UIDropDownMenu_AddButton(T('text', _G['ITEM_QUALITY'..i..'_DESC'], 'value', i, 'func', on_click))
end
end
tabs/search/results.lua
+3 -3
View File
@@ -56,7 +56,7 @@ do
while getn(searches) > search_index do
tremove(searches)
end
local search = -object('filter_string', filter_string, 'records', t)
local search = T('filter_string', filter_string, 'records', t)
tinsert(searches, search)
if getn(searches) > 5 then
tremove(searches, 1)
@@ -124,7 +124,7 @@ end
function update_auto_buy_filter()
if _G.aux_auto_buy_filter ~= '' then
local queries = filter_util.queries(_G.aux_auto_buy_filter)
local queries = aux.filter_util.queries(_G.aux_auto_buy_filter)
if queries then
if getn(queries) > 1 then
log 'Error: The automatic buyout filter does not support multi-queries'
@@ -319,7 +319,7 @@ function public.execute(resume, real_time)
end
local filter_string = search_box:GetText()
local queries = filter_util.queries(filter_string)
local queries = aux.filter_util.queries(filter_string)
if not queries then
return
elseif real_time then