diff --git a/resources/report/js/script.js b/resources/report/js/script.js index b20c27d4..f193185c 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -352,41 +352,6 @@ function processCefError(err) { showMessageBox('Error', err.message); } -function saveFilterState(evt) { - if (evt.currentTarget.checked) { - if (!loot.settings.filters) { - loot.settings.filters = {}; - } - loot.settings.filters[evt.currentTarget.id] = true; - } else { - if (loot.settings.filters) { - delete loot.settings.filters[evt.currentTarget.id]; - } - } - - var request = JSON.stringify({ - name: 'saveFilterState', - args: [ - evt.currentTarget.id, - evt.currentTarget.checked - ] - }); - - loot.query(request).catch(processCefError); -} -function applySavedFilters() { - if (loot.settings.filters) { - for (var key in loot.settings.filters) { - var elem = document.getElementById(key); - if (elem) { - elem.dispatchEvent(new MouseEvent('click')); - } - } - } -} -function isVisible(element) { - return (element.className.indexOf('hidden') == -1); -} function showElement(element) { if (element != null) { element.classList.toggle('hidden', false); @@ -459,13 +424,6 @@ function getConflictingPluginsFromFilter() { return Promise.resolve([]); } function applyFilters(evt) { - var cards = document.getElementById('main').getElementsByTagName('loot-plugin-card'); - var entries = document.getElementById('cardsNav').getElementsByTagName('loot-plugin-item'); - var hiddenPluginNo = 0; - var hiddenMessageNo = 0; - if (cards.length != entries.length) { - throw Error("Error: Number of plugins in sidebar doesn't match number of plugins in main area!"); - } /* The conflict filter, if enabled, executes C++ code, so needs to be handled using a promise, so the rest of the function should wait until it is completed. @@ -1206,13 +1164,6 @@ function handleSidebarClick(evt) { } } function setupEventHandlers() { - var elements; - /*Set up filter value and CSS setting storage read/write handlers.*/ - elements = document.getElementById('filters').getElementsByTagName('input'); - for (var i = 0; i < elements.length; ++i) { - elements[i].addEventListener('click', saveFilterState, false); - } - /*Set up handlers for filters.*/ document.getElementById('hideVersionNumbers').addEventListener('change', toggleDisplayCSS, false); document.getElementById('hideCRCs').addEventListener('change', toggleDisplayCSS, false); @@ -1224,6 +1175,10 @@ function setupEventHandlers() { document.getElementById('hideMessagelessPlugins').addEventListener('change', applyFilters, false); document.body.addEventListener('loot-filter-conflicts', handleConflictsFilter, false); + /* Set up event handlers for content filter. */ + document.getElementById('searchBox').addEventListener('change', handleSearch, false); + window.addEventListener('keyup', focusSearch, false); + /* Set up handlers for buttons. */ document.getElementById('redatePluginsButton').addEventListener('click', redatePlugins, false); document.getElementById('openLogButton').addEventListener('click', openLogLocation, false); @@ -1244,10 +1199,6 @@ function setupEventHandlers() { settings.getElementsByClassName('accept')[0].addEventListener('click', closeSettingsDialog, false); settings.getElementsByClassName('cancel')[0].addEventListener('click', closeSettingsDialog, false); - /* Set up event handlers for content search. */ - document.getElementById('searchBox').addEventListener('change', handleSearch, false); - window.addEventListener('keyup', focusSearch, false); - /* Set up handler for opening and closing editors. */ document.body.addEventListener('loot-editor-open', handleEditorOpen, false); document.body.addEventListener('loot-editor-close', handleEditorClose, false); diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp index 8d70d448..6ee0c1dd 100644 --- a/src/gui/handler.cpp +++ b/src/gui/handler.cpp @@ -296,13 +296,6 @@ namespace loot { return true; } - else if (requestName == "saveFilterState") { - const string id = request["args"][0].as(); - const string value = request["args"][1].as(); - SaveFilterState(id, value); - callback->Success(""); - return true; - } else if (requestName == "copyContent") { // Has one arg, just convert it to a YAML output string. try { @@ -409,20 +402,6 @@ namespace loot { return "null"; } - void Handler::SaveFilterState(const std::string& id, const std::string& value) { - BOOST_LOG_TRIVIAL(trace) << "Saving state of filter " << id << " as " << value; - YAML::Node settings = g_app_state.GetSettings(); - - if (value == "true") - settings["filters"][id] = true; - else if (value == "false" || value.empty()) - settings["filters"].remove(id); - else - settings["filters"][id] = value; - - g_app_state.UpdateSettings(settings); - } - std::string Handler::ApplyUserEdits(const YAML::Node& pluginMetadata) { BOOST_LOG_TRIVIAL(trace) << "Applying user edits for: " << pluginMetadata["name"].as(); // Create new object for userlist entry. diff --git a/src/gui/handler.h b/src/gui/handler.h index 69d3fd7f..320c9268 100644 --- a/src/gui/handler.h +++ b/src/gui/handler.h @@ -69,7 +69,6 @@ namespace loot { void GetConflictingPlugins(const std::string& pluginName, CefRefPtr frame, CefRefPtr callback); void CopyMetadata(const std::string& pluginName); std::string ClearPluginMetadata(const std::string& pluginName); - void SaveFilterState(const std::string& filterId, const std::string& value); std::string ApplyUserEdits(const YAML::Node& pluginMetadata); YAML::Node GenerateDerivedMetadata(const std::string& pluginName);