From 9975daca5c65a231141894c84ea550256821c1d9 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Tue, 8 Oct 2024 20:58:19 -0500
Subject: [PATCH] set naming convention for editor vars

---
 migrations/129_rename_editor_settings.rb | 16 ++++++++++++++++
 views/site_files/text_editor.erb         | 14 +++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 migrations/129_rename_editor_settings.rb

diff --git a/migrations/129_rename_editor_settings.rb b/migrations/129_rename_editor_settings.rb
new file mode 100644
index 00000000..6a106dc7
--- /dev/null
+++ b/migrations/129_rename_editor_settings.rb
@@ -0,0 +1,16 @@
+Sequel.migration do
+    up {
+      DB.rename_column :sites, :autocomplete_enabled, :editor_autocomplete_enabled
+      DB.rename_column :sites, :keyboard_mode,        :editor_keyboard_mode
+      DB.rename_column :sites, :tab_width,            :editor_tab_width
+      DB.drop_column :sites, :editor_keyboard_mode
+      DB.add_column :sites, :editor_keyboard_mode, String, size: 10
+    }
+  
+    down {
+      DB.rename_column :sites, :editor_autocomplete_enabled, :autocomplete_enabled
+      DB.rename_column :sites, :editor_tab_width,            :tab_width
+      DB.drop_column :sites, :editor_keyboard_mode
+      DB.add_column :sites, :keyboard_mode, :int, default: 0
+    }
+  end
\ No newline at end of file
diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index 49be773f..bd1c6b89 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -173,10 +173,10 @@
       <p>
         Keyboard Mode:
         <select name="editor_keyboard_mode">
-          <option value="" <% if current_site.owner.editor_keyboard_mode == 0 %>selected<% end %>>Default</option>
-          <option value="vim" <% if current_site.owner.editor_keyboard_mode == 1 %>selected<% end %>>Vim</option>
-          <option value="emacs" <% if current_site.owner.editor_keyboard_mode == 2 %>selected<% end %>>Emacs</option>
-          <option value="vscode" <% if current_site.owner.editor_keyboard_mode == 3 %>selected<% end %>>VSCode</option>
+          <option value="" <% if current_site.owner.editor_keyboard_mode.blank? %>selected<% end %>>Default</option>
+          <option value="vim" <% if current_site.owner.editor_keyboard_mode == 'vim' %>selected<% end %>>Vim</option>
+          <option value="emacs" <% if current_site.owner.editor_keyboard_mode == 'emacs' %>selected<% end %>>Emacs</option>
+          <option value="vscode" <% if current_site.owner.editor_keyboard_mode == 'vscode' %>selected<% end %>>VSCode</option>
         </select> 
       </p>
     </div>
@@ -294,11 +294,11 @@
           <% end %>
           enableSnippets: true,
         })
-        <% if current_site.owner.editor_keyboard_mode == 1%>
+        <% if current_site.owner.editor_keyboard_mode == 'vim' %>
         editor.setKeyboardHandler("ace/keyboard/vim");
-        <% elsif current_site.owner.editor_keyboard_mode == 2%>
+        <% elsif current_site.owner.editor_keyboard_mode == 'emacs' %>
         editor.setKeyboardHandler("ace/keyboard/emacs");
-        <% elsif current_site.owner.editor_keyboard_mode == 3%>
+        <% elsif current_site.owner.editor_keyboard_mode == 'vscode' %>
         editor.setKeyboardHandler("ace/keyboard/vscode");
         <% end %>