From 73ac3dc12df066a1fb35a24ebd4f35f7f5c8a70c Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Fri, 14 Jun 2013 22:22:03 -0700 Subject: [PATCH] Fix scrolling after leaving ,codemirror pages Browsing back from a code mirror file view should enable scrolling again on the main browser window. Change-Id: Ib46386e84de70ca49cee43ad4b85b5a7094feaac --- .../java/com/google/gerrit/client/diff/CodeMirrorDemo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java index 874951e814..d11e8e1211 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CodeMirrorDemo.java @@ -103,6 +103,7 @@ public class CodeMirrorDemo extends Screen { if (cmB != null) { cmB.refresh(); } + Window.enableScrolling(false); } @Override @@ -120,6 +121,7 @@ public class CodeMirrorDemo extends Screen { cmB.getWrapperElement().removeFromParent(); cmB = null; } + Window.enableScrolling(true); } private void display(DiffInfo diff) { @@ -141,7 +143,6 @@ public class CodeMirrorDemo extends Screen { }); cmA.on("scroll", doScroll(cmB)); cmB.on("scroll", doScroll(cmA)); - Window.enableScrolling(false); } private CodeMirror displaySide(DiffInfo.FileMeta meta, String contents,