From 3b647e1aa776687265a8bc3329ccf13bfc6750de Mon Sep 17 00:00:00 2001
From: Adam Jimenez <adam@bantha.co.uk>
Date: Wed, 14 Dec 2011 13:45:09 +0000
Subject: [PATCH] dragTimer renamed to dragDelay

Conflicts:

	lib/ace/mouse/mouse_handler.js
---
 lib/ace/editor.js                 |  8 ++++----
 lib/ace/mouse/default_handlers.js |  2 +-
 lib/ace/mouse/mouse_handler.js    | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index b3fa60c4..0ae8f9ad 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -529,12 +529,12 @@ var Editor = function(renderer, session) {
         return this.$mouseHandler.getScrollSpeed();
     };
 
-    this.setDragTimer = function(dragTimer) {
-        this.$mouseHandler.setDragTimer(dragTimer);
+    this.setDragDelay = function(dragDelay) {
+        this.$mouseHandler.setDragDelay(dragDelay);
     };
 
-    this.getDragTimer = function() {
-        return this.$mouseHandler.getDragTimer();
+    this.getDragDelay = function() {
+        return this.$mouseHandler.getDragDelay();
     };
 
     this.$selectionStyle = "line";
diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js
index 3d4e81e3..e7056e1c 100644
--- a/lib/ace/mouse/default_handlers.js
+++ b/lib/ace/mouse/default_handlers.js
@@ -171,7 +171,7 @@ function DefaultHandlers(editor) {
                     cursor.row = Math.max(0, Math.min(cursor.row, editor.session.getLength()-1));
                     onStartSelect(cursor);
                 }
-                else if ((time - mousedownTime) > editor.getDragTimer()) {
+                else if ((time - mousedownTime) > editor.getDragDelay()) {
                     state = STATE_DRAG;
                     dragRange = editor.getSelectionRange();
                     var style = editor.getSelectionStyle();
diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js
index f65c55c1..7fb3169e 100644
--- a/lib/ace/mouse/mouse_handler.js
+++ b/lib/ace/mouse/mouse_handler.js
@@ -89,13 +89,13 @@ var MouseHandler = function(editor) {
         this.editor._dispatchEvent(name, new MouseEvent(e, this.editor));
     };
     
-    this.$dragTimer = 250;
-    this.setDragTimer = function(dragTimer) {
-        this.$dragTimer = dragTimer;
+    this.$dragDelay = 250;
+    this.setDragDelay = function(dragDelay) {
+        this.$dragDelay = dragDelay;
     };
 
-    this.getDragTimer = function() {
-        return this.$dragTimer;
+    this.getDragDelay = function() {
+        return this.$dragDelay;
     };
 
     this.onMouseMove = function(name, e) {