diff options
| author | Shawn Pearce <sop@google.com> | 2013-11-22 01:57:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-22 01:57:44 +0000 |
| commit | e1571bc059f7b854a2ad566622ccf085ae6f1866 (patch) | |
| tree | 8e17fb966f87bbfe087ef0b841e72f7f7053e717 | |
| parent | 9f2a399635f3037d100b10924ee1dd4deed1fdd8 (diff) | |
| parent | 4badfef9cbd2e9c5c0afa48618a970c2257549ba (diff) | |
Merge "SideBySide2: Disable blinking cursor" into stable-2.8
3 files changed, 7 insertions, 2 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml index 2579cb8918..b757dd135d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml @@ -95,8 +95,8 @@ limitations under the License. cursor: pointer; } .difftable .CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor { - opacity: 0.8; - z-index: 2; + background: transparent; + text-decoration: underline; } .showtabs .cm-tab:before { content: "\00bb"; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java index 9897f9a12f..393ff737c2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java @@ -463,6 +463,8 @@ public class SideBySide2 extends Screen { } Configuration cfg = Configuration.create() .set("readOnly", true) + .set("cursorBlinkRate", 0) + .set("cursorHeight", 0.85) .set("lineNumbers", true) .set("tabSize", pref.getTabSize()) .set("mode", getContentType(meta)) diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java index 862e0f7cbb..ab031eb731 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java @@ -33,6 +33,9 @@ public class Configuration extends JavaScriptObject { public final native Configuration set(String name, int val) /*-{ this[name] = val; return this; }-*/; + public final native Configuration set(String name, double val) + /*-{ this[name] = val; return this; }-*/; + public final native Configuration set(String name, boolean val) /*-{ this[name] = val; return this; }-*/; |