commit 6442943d6a6de21b7d6d25b3fad2753a3c30d2d8
author Kasper Nilsson <kaspern@google.com> Tue Jan 30 19:20:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 30 19:20:02 2018 +0000
tree 2e8289c4c7ff4f77f9b98818ecc8225bdce4a3bb
parent 790e86331b02169309ee6f9e5256c31ffe6bb82e
parent 550045d9869dce20559e7e05b75e48389c974dc8

Merge "Add a few edit-related addons to codemirror"

gr-editor/gr-editor.js

diff --git a/gr-editor/gr-editor.js b/gr-editor/gr-editor.js
index 4621fe7..4001dab 100644
--- a/gr-editor/gr-editor.js
+++ b/gr-editor/gr-editor.js
@@ -58,16 +58,13 @@
         // TODO: Add gerrit's customizations from java codemirror to javascript
         // gerrit-gwtui/src/main/java/net/codemirror/lib/Extras.java
         params.autoCloseBrackets = prefs.auto_close_brackets;
-        params.cursorBlinkRate = prefs.cursor_blink_rate;
         params.cursorHeight = 0.85;
-        params.hideTopMenu = prefs.hide_top_menu;
         params.indentUnit = prefs.indent_unit;
         params.indentWithTabs = prefs.indent_with_tabs;
         // TODO(kaspern): Add support for keymaps.
         // params.keyMap = prefs.key_map_type.toLowerCase();
         params.lineLength = prefs.line_length;
-        // Line numbers are currently broken. See Issue 8114.
-        params.lineNumbers = false;
+        params.lineNumbers = !prefs.hide_line_numbers;
         params.lineWrapping = prefs.line_wrapping;
         params.indentWithTabs = prefs.indent_with_tabs;
         params.matchBrackets = prefs.match_brackets;