From 8bfbd5e9f9c1d2c4657bda2f6099f01fc8097846 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 31 Jan 2013 12:26:47 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
skins/larry/ui.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index d2faa36..d2638bb 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -1,7 +1,7 @@
/**
* Roundcube functions for default skin interface
*
- * Copyright (c) 2011, The Roundcube Dev Team
+ * Copyright (c) 2013, The Roundcube Dev Team
*
* The contents are subject to the Creative Commons Attribution-ShareAlike
* License. It is allowed to copy, distribute, transmit and to adapt the work
@@ -940,11 +940,11 @@
this.delay = 500;
this.top
- .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
+ .mouseenter(function() { if (rcmail.drag_active) ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
this.bottom
- .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
+ .mouseenter(function() { if (rcmail.drag_active) ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
this.scroll = function(dir)
--
Gitblit v1.9.1