From 6caba032dd9de70ea9435a0ae7ea7978fd542ae7 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Tue, 1 May 2012 17:13:51 +0200
Subject: [PATCH] Revert "don't use animated scrolling setting"

This reverts commit 7225a327368c17025ff14f5eb1f033f3e1fd2529.
---
 demo/kitchen-sink/demo.js | 7 +++++++
 kitchen-sink.html         | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index 838bb3a0..bcd240ff 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -302,6 +302,7 @@ split.on("focus", function(editor) {
 env.split = split;
 window.env = env;
 window.editor = window.ace = env.editor;
+env.editor.setAnimatedScroll(true);
 
 var docEl = document.getElementById("doc");
 var modeEl = document.getElementById("mode");
@@ -315,6 +316,7 @@ var showGutterEl = document.getElementById("show_gutter");
 var showPrintMarginEl = document.getElementById("show_print_margin");
 var highlightSelectedWordE = document.getElementById("highlight_selected_word");
 var showHScrollEl = document.getElementById("show_hscroll");
+var animateScrollEl = document.getElementById("animate_scroll");
 var softTabEl = document.getElementById("soft_tab");
 var behavioursEl = document.getElementById("enable_behaviours");
 
@@ -371,6 +373,7 @@ function updateUIEditorOptions() {
     saveOption(showPrintMarginEl, editor.renderer.getShowPrintMargin());
     saveOption(highlightSelectedWordE, editor.getHighlightSelectedWord());
     saveOption(showHScrollEl, editor.renderer.getHScrollBarAlwaysVisible());
+    saveOption(animateScrollEl, editor.getAnimatedScroll());
     saveOption(softTabEl, session.getUseSoftTabs());
     saveOption(behavioursEl, editor.getBehavioursEnabled());
 }
@@ -484,6 +487,10 @@ bindCheckbox("show_hscroll", function(checked) {
     env.editor.renderer.setHScrollBarAlwaysVisible(checked);
 });
 
+bindCheckbox("animate_scroll", function(checked) {
+    env.editor.setAnimatedScroll(checked);
+});
+
 bindCheckbox("soft_tab", function(checked) {
     env.editor.getSession().setUseSoftTabs(checked);
 });
diff --git a/kitchen-sink.html b/kitchen-sink.html
index 9e9dbf57..5fc01e17 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -132,6 +132,13 @@
         <input type="checkbox" name="show_hscroll" id="show_hscroll">
       </td>
     </tr>
+    <tr>
+      <td >
+        <label for="animate_scroll">Animate scrolling</label>
+      </td><td>
+        <input type="checkbox" name="animate_scroll" id="animate_scroll">
+      </td>
+    </tr>
     <tr>
       <td >
         <label for="keybinding">Key Binding</label>