From 84731e1f7200c29482317d296f86f72720c7f536 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Thu, 15 Jan 2015 10:59:18 +0000
Subject: [PATCH] Move filter-related JS function into filters.js

---
 resources/report/js/filters.js | 45 ++++++++++++++++++++++++++++++++++
 resources/report/js/script.js  | 44 ---------------------------------
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/resources/report/js/filters.js b/resources/report/js/filters.js
index f605f4ac..8b9a756c 100644
--- a/resources/report/js/filters.js
+++ b/resources/report/js/filters.js
@@ -146,6 +146,51 @@ var filters = {
     },
 };
 
+function getConflictingPluginsFromFilter() {
+    var conflictsPlugin = document.body.getAttribute('data-conflicts');
+    if (conflictsPlugin) {
+        /* Now get conflicts for the plugin. */
+        var request = JSON.stringify({
+            name: 'getConflictingPlugins',
+            args: [
+                conflictsPlugin
+            ]
+        });
+
+        showProgress(l10n.jed.translate('Checking if plugins have been loaded...').fetch());
+
+        return loot.query(request).then(JSON.parse).then(function(result){
+            if (result) {
+                /* Filter everything but the plugin itself if there are no
+                   conflicts. */
+                var conflicts = [ conflictsPlugin ];
+                for (var key in result) {
+                    if (result[key].conflicts) {
+                        conflicts.push(key);
+                    }
+                    for (var i = 0; i < loot.game.plugins.length; ++i) {
+                        if (loot.game.plugins[i].name == key) {
+                            loot.game.plugins[i].crc = result[key].crc;
+                            loot.game.plugins[i].isEmpty = result[key].isEmpty;
+
+                            loot.game.plugins[i].messages = result[key].messages;
+                            loot.game.plugins[i].tags = result[key].tags;
+                            loot.game.plugins[i].isDirty = result[key].isDirty;
+                            break;
+                        }
+                    }
+                }
+                closeProgressDialog();
+                return conflicts;
+            }
+            closeProgressDialog();
+            return [ conflictsPlugin ];
+        }).catch(processCefError);
+    }
+
+    return Promise.resolve([]);
+}
+
 function setFilteredUIData(evt) {
     /* 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
diff --git a/resources/report/js/script.js b/resources/report/js/script.js
index 7c9a1e45..c687991a 100644
--- a/resources/report/js/script.js
+++ b/resources/report/js/script.js
@@ -57,50 +57,6 @@ function toast(text) {
     toast.text = text;
     toast.show();
 }
-function getConflictingPluginsFromFilter() {
-    var conflictsPlugin = document.body.getAttribute('data-conflicts');
-    if (conflictsPlugin) {
-        /* Now get conflicts for the plugin. */
-        var request = JSON.stringify({
-            name: 'getConflictingPlugins',
-            args: [
-                conflictsPlugin
-            ]
-        });
-
-        showProgress(l10n.jed.translate('Checking if plugins have been loaded...').fetch());
-
-        return loot.query(request).then(JSON.parse).then(function(result){
-            if (result) {
-                /* Filter everything but the plugin itself if there are no
-                   conflicts. */
-                var conflicts = [ conflictsPlugin ];
-                for (var key in result) {
-                    if (result[key].conflicts) {
-                        conflicts.push(key);
-                    }
-                    for (var i = 0; i < loot.game.plugins.length; ++i) {
-                        if (loot.game.plugins[i].name == key) {
-                            loot.game.plugins[i].crc = result[key].crc;
-                            loot.game.plugins[i].isEmpty = result[key].isEmpty;
-
-                            loot.game.plugins[i].messages = result[key].messages;
-                            loot.game.plugins[i].tags = result[key].tags;
-                            loot.game.plugins[i].isDirty = result[key].isDirty;
-                            break;
-                        }
-                    }
-                }
-                closeProgressDialog();
-                return conflicts;
-            }
-            closeProgressDialog();
-            return [ conflictsPlugin ];
-        }).catch(processCefError);
-    }
-
-    return Promise.resolve([]);
-}
 function showMessageDialog(title, text, positiveText, closeCallback) {
     var dialog = document.createElement('loot-message-dialog');
     dialog.setButtonText(positiveText, l10n.jed.translate('Cancel').fetch());