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 22:46:00 +02:00
parent 12bf048606
commit 07bd5c4d1c
3 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tabs/search/filter.lua
+9 -9
View File
@@ -100,16 +100,16 @@ function update_form()
end
function get_filter_builder_query()
local query_string
local filter_string
local function add(part)
if part then
query_string = query_string and query_string..'/'..part or part
filter_string = filter_string and filter_string..'/'..part or part
end
end
local name = blizzard_query.name
if not index(filter_util.parse_query_string(name), 'blizzard', 'name') then
if not index(filter_util.parse_filter_string(name), 'blizzard', 'name') then
name = filter_util.quote(name)
end
add((name ~= '' or blizzard_query.exact) and name)
@@ -134,10 +134,10 @@ function get_filter_builder_query()
add(strlower(_G['ITEM_QUALITY'..quality..'_DESC']))
end
local post_filter_string = filter_util.query_string(temp-T('blizzard', tt, 'post', post_filter))
local post_filter_string = filter_util.filter_string(temp-T('blizzard', tt, 'post', post_filter))
add(post_filter_string ~= '' and post_filter_string)
return query_string or ''
return filter_string or ''
end
function set_form(components)
@@ -170,14 +170,14 @@ function clear_form()
update_filter_display()
end
function import_query_string()
local components, error = filter_util.parse_query_string(select(3, strfind(search_box:GetText(), '^([^;]*)')))
function import_filter_string()
local components, error = filter_util.parse_filter_string(select(3, strfind(search_box:GetText(), '^([^;]*)')))
if components or log(error) then
set_form(components)
end
end
function export_query_string()
function export_filter_string()
search_box:SetText(get_filter_builder_query())
filter_parameter_input:ClearFocus()
end
@@ -265,7 +265,7 @@ function add_post_filter()
str = str..'/'..filter_parameter_input:GetText()
end
end
local components, error, suggestions = filter_util.parse_query_string(str)
local components, error, suggestions = filter_util.parse_filter_string(str)
if components and getn(components.blizzard) == 0 and getn(components.post) == 1 then
add_component(components.post[1])
update_filter_display()
tabs/search/frame.lua
+4 -4
View File
@@ -327,7 +327,7 @@ function create_frames()
gui.set_size(btn1, 80, 24)
btn1:SetText('Search')
btn1:SetScript('OnClick', function()
export_query_string()
export_filter_string()
execute()
end)
@@ -335,13 +335,13 @@ function create_frames()
btn2:SetPoint('LEFT', btn1, 'RIGHT', 5, 0)
gui.set_size(btn2, 80, 24)
btn2:SetText('Export')
btn2:SetScript('OnClick', export_query_string)
btn2:SetScript('OnClick', export_filter_string)
local btn3 = gui.button(frame.filter, 16)
btn3:SetPoint('LEFT', btn2, 'RIGHT', 5, 0)
gui.set_size(btn3, 80, 24)
btn3:SetText('Import')
btn3:SetScript('OnClick', import_query_string)
btn3:SetScript('OnClick', import_filter_string)
end
do
local editbox = gui.editbox(frame.filter)
@@ -515,7 +515,7 @@ function create_frames()
input.change = function()
local text = this:GetText()
if filter_util.filters[text] and filter_util.filters[text].input_type ~= '' then
local _, _, suggestions = filter_util.parse_query_string(text..'/')
local _, _, suggestions = filter_util.parse_filter_string(text..'/')
filter_parameter_input:SetNumeric(filter_util.filters[text].input_type == 'number')
filter_parameter_input.complete = completion.complete(function() return suggestions or {} end)
filter_parameter_input:Show()