diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js
index 4534fe864..095e4187c 100644
--- a/apps/common/main/lib/component/HintManager.js
+++ b/apps/common/main/lib/component/HintManager.js
@@ -260,6 +260,8 @@ Common.UI.HintManager = new(function() {
_getControls();
_currentControls.forEach(function(item, index) {
if (!_isItemDisabled(item)) {
+ var leftBorder = 0,
+ rightBorder = docW;
if ($(_currentSection).prop('id') === 'toolbar' && ($(_currentSection).find('.toolbar-mask').length > 0 || item.closest('.group').find('.toolbar-group-mask').length > 0)) {
return;
}
@@ -269,6 +271,15 @@ Common.UI.HintManager = new(function() {
return;
}
}
+ if (_currentLevel === 0 && item.closest('.tabs.short').length > 0) {
+ var blockTabs = item.closest('.tabs.short');
+ leftBorder = blockTabs.offset().left;
+ rightBorder = leftBorder + blockTabs.width();
+ if (!item.hasClass('scroll')) {
+ leftBorder += 20;
+ rightBorder -= 20;
+ }
+ }
var hint = $('
' + item.attr('data-hint-title') + '
');
var direction = item.attr('data-hint-direction');
// exceptions
@@ -327,7 +338,7 @@ Common.UI.HintManager = new(function() {
left = offset.left + (item.outerWidth() - 18) / 2 + offsets[1];
}
- if (top < maxHeight && left < docW && top > topSection && top < bottomSection) {
+ if (top < maxHeight && left < docW && top > topSection && top < bottomSection && left > leftBorder && left + 18 < rightBorder) {
hint.css({
top: top,
left: left
@@ -452,7 +463,7 @@ Common.UI.HintManager = new(function() {
}
}
}
- if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' || curr.prop('id') === 'left-btn-thumbs') {
+ if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' || curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll')) {
_resetToDefault();
return;
}
diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js
index 80bf8c471..44fc291ab 100644
--- a/apps/common/main/lib/component/Mixtbar.js
+++ b/apps/common/main/lib/component/Mixtbar.js
@@ -93,7 +93,7 @@ define([
var _template_tabs =
'' +
- '' +
+ '' +
'' +
'<% for(var i in items) { %>' +
'<% if (typeof items[i] == "object") { %>' +
@@ -105,7 +105,7 @@ define([
'<% } %>' +
'<% } %>' +
'
' +
- '' +
+ '' +
'';
this.$layout = $(options.template({