From e10c1b1da75ed99239dc028b53a07f8fefe89b8f Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Sat, 1 Sep 2012 23:30:40 -0700
Subject: Remove an old upgrade codepath for version 1.21.

We're on 1.37 now so I think we're in the clear.
---
 background_scripts/main.coffee | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 49a1cee5..118d9839 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -588,25 +588,12 @@ sendRequestHandlers =
 init = ->
   Commands.clearKeyMappingsAndSetDefaults()
 
-  if (Settings.has("keyMappings"))
+  if Settings.has("keyMappings")
     Commands.parseCustomKeyMappings(Settings.get("keyMappings"))
 
-  # In version 1.22, we changed the mapping for "d" and "u" to be scroll page down/up instead of close
-  # and restore tab. For existing users, we want to preserve existing behavior for them by adding some
-  # custom key mappings on their behalf.
-  if (Settings.get("previousVersion") == "1.21")
-    customKeyMappings = Settings.get("keyMappings") || ""
-    if ((Commands.keyToCommandRegistry["d"] || {}).command == "scrollPageDown")
-      customKeyMappings += "\nmap d removeTab"
-    if ((Commands.keyToCommandRegistry["u"] || {}).command == "scrollPageUp")
-      customKeyMappings += "\nmap u restoreTab"
-    if (customKeyMappings != "")
-      Settings.set("keyMappings", customKeyMappings)
-      Commands.parseCustomKeyMappings(customKeyMappings)
-
   populateValidFirstKeys()
   populateSingleKeyCommands()
-  if (shouldShowUpgradeMessage())
+  if shouldShowUpgradeMessage()
     sendRequestToAllTabs({ name: "showUpgradeNotification", version: currentVersion })
 
   # Ensure that openTabs is populated when Vimium is installed.
@@ -621,7 +608,5 @@ init = ->
 
 init()
 
-#
 # Convenience function for development use.
-#
 runTests = -> open(chrome.extension.getURL('test_harnesses/automated.html'))
-- 
cgit v1.2.3