From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/js/jquery.tipsy.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js
index dcb1bb5..2bb5a30 100644
--- a/interface/web/js/jquery.tipsy.js
+++ b/interface/web/js/jquery.tipsy.js
@@ -166,7 +166,7 @@
if (!options.live) this.each(function() { get(this); });
if (options.trigger != 'manual') {
- var binder = options.live ? 'live' : 'bind',
+ var binder = options.live ? 'on' : 'bind',
eventIn = options.trigger == 'hover' ? 'mouseenter' : 'focus',
eventOut = options.trigger == 'hover' ? 'mouseleave' : 'blur';
this[binder](eventIn, enter)[binder](eventOut, leave);
--
Gitblit v1.9.1