From 74ea85d19ce126d69cb521cf9abe37ca4c099944 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 28 Jun 2017 22:15:30 +0100
Subject: [PATCH] Ensure existing grid settings are migrated to new keys

---
 editor/js/ui/userSettings.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/editor/js/ui/userSettings.js b/editor/js/ui/userSettings.js
index c44cd05f8..fa29b2e5a 100644
--- a/editor/js/ui/userSettings.js
+++ b/editor/js/ui/userSettings.js
@@ -102,21 +102,21 @@ RED.userSettings = (function() {
         {
             title: "Grid",
             options: [
-                {setting:"view-show-grid",label:"menu.label.view.showGrid",toggle:true,onchange:"core:toggle-show-grid"},
-                {setting:"view-snap-grid",label:"menu.label.view.snapGrid",toggle:true,onchange:"core:toggle-snap-grid"},
+                {setting:"view-show-grid",oldSetting:"menu-menu-item-view-show-grid",label:"menu.label.view.showGrid",toggle:true,onchange:"core:toggle-show-grid"},
+                {setting:"view-snap-grid",oldSetting:"menu-menu-item-view-snap-grid",label:"menu.label.view.snapGrid",toggle:true,onchange:"core:toggle-snap-grid"},
                 {setting:"view-grid-size",label:"menu.label.view.gridSize",type:"number",default: 20, onchange:RED.view.gridSize}
             ]
         },
         {
             title: "Nodes",
             options: [
-                {setting:"view-node-status",label:"menu.label.displayStatus",default: true, toggle:true,onchange:"core:toggle-status"}
+                {setting:"view-node-status",oldSetting:"menu-menu-item-status",label:"menu.label.displayStatus",default: true, toggle:true,onchange:"core:toggle-status"}
             ]
         },
         {
             title: "Other",
             options: [
-                {setting:"view-show-tips",label:"menu.label.showTips",toggle:true,default:true,onchange:"core:toggle-show-tips"}
+                {setting:"view-show-tips",oldSettings:"menu-menu-item-show-tips",label:"menu.label.showTips",toggle:true,default:true,onchange:"core:toggle-show-tips"}
             ]
         }
     ];
@@ -187,6 +187,13 @@ RED.userSettings = (function() {
 
         viewSettings.forEach(function(section) {
             section.options.forEach(function(opt) {
+                if (opt.oldSetting) {
+                    var oldValue = RED.settings.get(opt.oldSetting);
+                    if (oldValue !== undefined && oldValue !== null) {
+                        RED.settings.set(opt.setting,oldValue);
+                        RED.settings.remove(opt.oldSetting);
+                    }
+                }
                 allSettings[opt.setting] = opt;
                 if (opt.onchange) {
                     var value = RED.settings.get(opt.setting);