diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index f3e9416b1..969b96423 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -177,7 +177,7 @@ Common.UI.HintManager = new(function() { if (_currentControls.length === 0) _getControls(); _currentControls.forEach(function(item, index) { - if (!item.hasClass('disabled') && !item.parent().hasClass('disabled')) { + if (!item.hasClass('disabled') && !item.parent().hasClass('disabled') && !item.attr('disabled')) { var hint = $('
' + item.attr('data-hint-title') + '
'); var direction = item.attr('data-hint-direction'); // exceptions diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 6cba59044..45781cc81 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -886,7 +886,7 @@ Common.Utils.lockControls = function(causes, lock, opts, defControls) { }); }; -Common.Utils.injectButtons = function($slots, id, iconCls, caption, lock, split, menu, toggle, dataHint, dataHintDirection, dataHintOffset) { +Common.Utils.injectButtons = function($slots, id, iconCls, caption, lock, split, menu, toggle, dataHint, dataHintDirection, dataHintOffset, dataHintTitle) { var btnsArr = createButtonSet(); btnsArr.setDisabled(true); id = id || ("id-toolbar-" + iconCls); @@ -907,7 +907,8 @@ Common.Utils.injectButtons = function($slots, id, iconCls, caption, lock, split, disabled: true, dataHint: dataHint, dataHintDirection: dataHintDirection, - dataHintOffset: dataHintOffset + dataHintOffset: dataHintOffset, + dataHintTitle: dataHintTitle }); btnsArr.add(button); diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 674d1cac3..d61854e49 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -85,7 +85,7 @@ define([ '
' + // '' + '