From bfe304932b13eb1bfe65662490d3d6b830eefec7 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Mon, 27 Apr 2015 19:58:10 +0100
Subject: Only perform settings migration in the background page

---
 background_scripts/settings.coffee | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'background_scripts/settings.coffee')

diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee
index 6b33d239..607264a2 100644
--- a/background_scripts/settings.coffee
+++ b/background_scripts/settings.coffee
@@ -175,16 +175,18 @@ root.Settings = Settings =
 # Export Sync via Settings for tests.
 root.Settings.Sync = Sync
 
-
-# We use settingsVersion to coordinate any necessary schema changes.
-if Utils.compareVersions("1.42", Settings.get("settingsVersion")) != -1
-  Settings.set("scrollStepSize", parseFloat Settings.get("scrollStepSize"))
-Settings.set("settingsVersion", Utils.getCurrentVersion())
-
-# Migration (after 1.49, 2015/2/1).
-# Legacy setting: findModeRawQuery (a string).
-# New setting: findModeRawQueryList (a list of strings), now stored in chrome.storage.local (not localStorage).
-chrome.storage.local.get "findModeRawQueryList", (items) ->
-  unless chrome.runtime.lastError or items.findModeRawQueryList
-    rawQuery = Settings.get "findModeRawQuery"
-    chrome.storage.local.set findModeRawQueryList: (if rawQuery then [ rawQuery ] else [])
+# Perform migration from old settings versions, if this is the background page.
+if Utils.isBackgroundPage()
+
+  # We use settingsVersion to coordinate any necessary schema changes.
+  if Utils.compareVersions("1.42", Settings.get("settingsVersion")) != -1
+    Settings.set("scrollStepSize", parseFloat Settings.get("scrollStepSize"))
+  Settings.set("settingsVersion", Utils.getCurrentVersion())
+
+  # Migration (after 1.49, 2015/2/1).
+  # Legacy setting: findModeRawQuery (a string).
+  # New setting: findModeRawQueryList (a list of strings), now stored in chrome.storage.local (not localStorage).
+  chrome.storage.local.get "findModeRawQueryList", (items) ->
+    unless chrome.runtime.lastError or items.findModeRawQueryList
+      rawQuery = Settings.get "findModeRawQuery"
+      chrome.storage.local.set findModeRawQueryList: (if rawQuery then [ rawQuery ] else [])
-- 
cgit v1.2.3