big module refactoring

This commit is contained in:
Manuel Simon Hirsig
2016-08-18 17:28:38 +02:00
parent 54c45f8fdb
commit 337bc19578
17 changed files with 145 additions and 143 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ StaticPopupDialogs['AUX_SEARCH_AUTO_BUY'] = {
}
do
local function action()
aux_auto_buy_filter = getglobal(this:GetParent():GetName()..'EditBox'):GetText()
_G.aux_auto_buy_filter = getglobal(this:GetParent():GetName()..'EditBox'):GetText()
m.update_auto_buy_filter()
end
+12 -12
View File
@@ -169,7 +169,7 @@ function private.create_frames()
btn:SetScript('OnClick', function()
if this:GetChecked() then
this:SetChecked(false)
aux_auto_buy_filter = nil
_G.aux_auto_buy_filter = nil
this.prettified = nil
m.auto_buy_validator = nil
else
@@ -334,7 +334,7 @@ function private.create_frames()
btn:SetScript('OnClick', function()
local filters = aux.filter.queries(m.search_box:GetText())
if filters then
tinsert(aux_favorite_searches, 1, {
tinsert(_G.aux_favorite_searches, 1, {
filter_string = m.search_box:GetText(),
prettified = table.concat(aux.util.map(filters, function(filter) return filter.prettified end), ';'),
})
@@ -369,7 +369,7 @@ function private.create_frames()
end
do
local editbox = aux.gui.editbox(m.frame.filter)
editbox.complete_item = aux.completion.complete(function() return aux_auctionable_items end)
editbox.complete_item = aux.completion.complete(function() return _G.aux_auctionable_items end)
editbox:SetPoint('TOPLEFT', 14, -m.FILTER_SPACING)
editbox:SetWidth(260)
editbox:SetScript('OnChar', function()
@@ -653,16 +653,16 @@ function private.create_frames()
m.add_filter(data.search.filter_string)
elseif button == 'LeftButton' and IsControlKeyDown() then
if st == m.favorite_searches_listing and data.index > 1 then
local temp = aux_favorite_searches[data.index - 1]
aux_favorite_searches[data.index - 1] = data.search
aux_favorite_searches[data.index] = temp
local temp = _G.aux_favorite_searches[data.index - 1]
_G.aux_favorite_searches[data.index - 1] = data.search
_G.aux_favorite_searches[data.index] = temp
m.update_search_listings()
end
elseif button == 'RightButton' and IsControlKeyDown() then
if st == m.favorite_searches_listing and data.index < getn(aux_favorite_searches) then
local temp = aux_favorite_searches[data.index + 1]
aux_favorite_searches[data.index + 1] = data.search
aux_favorite_searches[data.index] = temp
if st == m.favorite_searches_listing and data.index < getn(_G.aux_favorite_searches) then
local temp = _G.aux_favorite_searches[data.index + 1]
_G.aux_favorite_searches[data.index + 1] = data.search
_G.aux_favorite_searches[data.index] = temp
m.update_search_listings()
end
elseif button == 'LeftButton' then
@@ -670,9 +670,9 @@ function private.create_frames()
m.execute()
elseif button == 'RightButton' then
if st == m.recent_searches_listing then
tinsert(aux_favorite_searches, 1, data.search)
tinsert(_G.aux_favorite_searches, 1, data.search)
elseif st == m.favorite_searches_listing then
tremove(aux_favorite_searches, data.index)
tremove(_G.aux_favorite_searches, data.index)
end
m.update_search_listings()
end
+4 -4
View File
@@ -1,6 +1,6 @@
aux.module 'search_tab'
aux_auto_buy_filter = ''
_G.aux_auto_buy_filter = ''
private.search_scan_id = 0
private.auto_buy_validator = nil
@@ -114,8 +114,8 @@ function private:update_start_stop()
end
function private.update_auto_buy_filter()
if aux_auto_buy_filter ~= '' then
local queries = aux.filter.queries(aux_auto_buy_filter)
if _G.aux_auto_buy_filter ~= '' then
local queries = aux.filter.queries(_G.aux_auto_buy_filter)
if queries then
if getn(queries) > 1 then
aux.log('Error: The automatic buyout filter may contain only one query')
@@ -129,7 +129,7 @@ function private.update_auto_buy_filter()
end
end
end
aux_auto_buy_filter = ''
_G.aux_auto_buy_filter = ''
end
function private.start_real_time_scan(query, search, continuation)
+7 -7
View File
@@ -1,11 +1,11 @@
aux.module 'search_tab'
aux_favorite_searches = {}
aux_recent_searches = {}
_G.aux_favorite_searches = {}
_G.aux_recent_searches = {}
function private.update_search_listings()
local favorite_search_rows = {}
for i, favorite_search in aux_favorite_searches do
for i, favorite_search in _G.aux_favorite_searches do
local name = strsub(favorite_search.prettified, 1, 250)
tinsert(favorite_search_rows, {
cols = {{value=name}},
@@ -16,7 +16,7 @@ function private.update_search_listings()
m.favorite_searches_listing:SetData(favorite_search_rows)
local recent_search_rows = {}
for i, recent_search in aux_recent_searches do
for i, recent_search in _G.aux_recent_searches do
local name = strsub(recent_search.prettified, 1, 250)
tinsert(recent_search_rows, {
cols = {{value=name}},
@@ -28,12 +28,12 @@ function private.update_search_listings()
end
function private.new_recent_search(filter_string, prettified)
tinsert(aux_recent_searches, 1, {
tinsert(_G.aux_recent_searches, 1, {
filter_string = filter_string,
prettified = prettified,
})
while getn(aux_recent_searches) > 50 do
tremove(aux_recent_searches)
while getn(_G.aux_recent_searches) > 50 do
tremove(_G.aux_recent_searches)
end
m.update_search_listings()
end