This commit is contained in:
Manuel Simon Hirsig
2016-08-09 18:48:58 +02:00
parent 82b61bb07f
commit 3abdaa1473
2 changed files with 14 additions and 14 deletions
+13 -13
View File
@@ -146,20 +146,13 @@ function public.formatted_post_filter(components)
end end
no_line_break = component[1] == 'operator' and component[2] == 'not' no_line_break = component[1] == 'operator' and component[2] == 'not'
local OPERATOR_COLOR, FILTER_COLOR, PARAMETER_COLOR local component_text = component[2]
if m.filter_builder_state.selected == i then if component[1] == 'operator' and component[2] ~= 'not' then
OPERATOR_COLOR, FILTER_COLOR, PARAMETER_COLOR = aux.auction_listing.colors.GREEN, aux.auction_listing.colors.GREEN, aux.auction_listing.colors.ORANGE component_text = component_text..(tonumber(component[3]) or '')
else
OPERATOR_COLOR, FILTER_COLOR, PARAMETER_COLOR = aux.auction_listing.colors.YELLOW, aux.auction_listing.colors.YELLOW, aux.auction_listing.colors.ORANGE
end
local component_text
if component[1] == 'operator' then
component_text = OPERATOR_COLOR..component[2]..(component[2] ~= 'not' and tonumber(component[3]) or '')..FONT_COLOR_CODE_CLOSE
tinsert(stack, component[3]) tinsert(stack, component[3])
elseif component[1] == 'filter' then elseif component[1] == 'filter' then
component_text = FILTER_COLOR..component[2]..FONT_COLOR_CODE_CLOSE
if component[3] then if component[3] then
component_text = component_text..': '..PARAMETER_COLOR..component[3]..FONT_COLOR_CODE_CLOSE component_text = component[3] and component_text..': '..aux.auction_listing.colors.ORANGE..component[3]..FONT_COLOR_CODE_CLOSE or component_text
end end
while getn(stack) > 0 and stack[getn(stack)] do while getn(stack) > 0 and stack[getn(stack)] do
local top = tremove(stack) local top = tremove(stack)
@@ -169,6 +162,11 @@ function public.formatted_post_filter(components)
end end
end end
end end
if m.filter_builder_state.selected == i then
component_text = LIGHTYELLOW_FONT_COLOR_CODE..component_text..FONT_COLOR_CODE_CLOSE
else
component_text = aux.auction_listing.colors.YELLOW..component_text..FONT_COLOR_CODE_CLOSE
end
str = str..m.data_link(i, component_text) str = str..m.data_link(i, component_text)
end end
@@ -217,8 +215,10 @@ function private.add_dropdown_component()
end end
str = str..(arity or '') str = str..(arity or '')
end end
if aux.index(aux.filter.filters[str], 'input_type') or '' ~= '' then for _, filter in {aux.filter.filters[str]} do
str = str..'/'..m.filter_input:GetText() if filter.input_type ~= '' then
str = str..'/'..m.filter_input:GetText()
end
end end
local components, error, suggestions = aux.filter.parse_query_string(str) local components, error, suggestions = aux.filter.parse_query_string(str)
+1 -1
View File
@@ -510,7 +510,7 @@ function private.create_frames()
if arg1 == 'LeftButton' then if arg1 == 'LeftButton' then
m.add_dropdown_component() m.add_dropdown_component()
elseif arg1 == 'RightButton' then elseif arg1 == 'RightButton' then
m.remove_post_component() m.remove_component()
end end
end) end)
private.filter_button = btn private.filter_button = btn