Merge "Fix scrolling after leaving ,codemirror pages"

This commit is contained in:
Shawn Pearce
2013-06-15 05:42:52 +00:00
committed by Gerrit Code Review

View File

@@ -103,6 +103,7 @@ public class CodeMirrorDemo extends Screen {
if (cmB != null) { if (cmB != null) {
cmB.refresh(); cmB.refresh();
} }
Window.enableScrolling(false);
} }
@Override @Override
@@ -120,6 +121,7 @@ public class CodeMirrorDemo extends Screen {
cmB.getWrapperElement().removeFromParent(); cmB.getWrapperElement().removeFromParent();
cmB = null; cmB = null;
} }
Window.enableScrolling(true);
} }
private void display(DiffInfo diff) { private void display(DiffInfo diff) {
@@ -141,7 +143,6 @@ public class CodeMirrorDemo extends Screen {
}); });
cmA.on("scroll", doScroll(cmB)); cmA.on("scroll", doScroll(cmB));
cmB.on("scroll", doScroll(cmA)); cmB.on("scroll", doScroll(cmA));
Window.enableScrolling(false);
} }
private CodeMirror displaySide(DiffInfo.FileMeta meta, String contents, private CodeMirror displaySide(DiffInfo.FileMeta meta, String contents,