From 78efbe932b6c40fdadfef2a3b0594ecb360951e3 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 13 Jan 2017 15:49:06 +0100 Subject: [PATCH] =?utf8?q?ActionBar:=20Tooltips=20f=C3=BCr=20Deaktivierung?= =?utf8?q?=20=C3=BCberschreibt=20normalen=20Tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- js/kivi.ActionBar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js index e6a847771..d73278309 100644 --- a/js/kivi.ActionBar.js +++ b/js/kivi.ActionBar.js @@ -110,9 +110,9 @@ namespace('kivi', function(k){ var data = $(e).data('action'); if (undefined === data) return; - if (data.disabled) { + if (data.disabled && (data.disabled != '0')) { $(e).addClass(CLASSES.disabled); - if (!data.tooltip && (data.disabled != '1')) + if (data.disabled != '1') data.tooltip = data.disabled; } -- 2.20.1