diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index 43c5346c3..d7f60c17c 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -120,7 +120,11 @@ Common.UI.HintManager = new(function() { var _api; - var _setCurrentSection = function (btn) { + var _setCurrentSection = function (btn, section) { + if (section) { + _currentSection = section; + return; + } if (btn === 'esc') { if (_currentLevel === 0) { _currentSection = document; @@ -172,11 +176,15 @@ Common.UI.HintManager = new(function() { clearInterval(_inputTimer); }; - var _nextLevel = function() { + var _nextLevel = function(level) { _removeHints(); _currentHints.length = 0; _currentControls.length = 0; - _currentLevel++; + if (level !== undefined) { + _currentLevel = level; + } else { + _currentLevel++; + } }; var _prevLevel = function() { @@ -476,8 +484,9 @@ Common.UI.HintManager = new(function() { _resetToDefault(); return; } - var needOpenPanel = (curr.attr('content-target') && !$('#' + curr.attr('content-target')).is(':visible')); - if (!curr.attr('content-target') || needOpenPanel) { // need to open panel + var needOpenPanel = (curr.attr('content-target') && !$('#' + curr.attr('content-target')).is(':visible') || + (curr.parent().prop('id') === 'slot-btn-chat' && !$('#left-panel-chat').is(':visible'))); + if ((!curr.attr('content-target') && curr.parent().prop('id') !== 'slot-btn-chat') || needOpenPanel) { // need to open panel if (!($('#file-menu-panel').is(':visible') && (curr.parent().prop('id') === 'fm-btn-info' && $('#panel-info').is(':visible') || curr.parent().prop('id') === 'fm-btn-settings' && $('#panel-settings').is(':visible')))) { if (curr.attr('for')) { // to trigger event in checkbox @@ -503,8 +512,13 @@ Common.UI.HintManager = new(function() { return; } if (!_isComplete) { - _nextLevel(); - _setCurrentSection(curr); + if (curr.parent().prop('id') === 'slot-btn-chat') { + _nextLevel(1); + _setCurrentSection(undefined, $('#left-menu.hint-section')); + } else { + _nextLevel(); + _setCurrentSection(curr); + } _showHints(); if (_currentHints.length < 1) { _resetToDefault(); @@ -516,7 +530,7 @@ Common.UI.HintManager = new(function() { } } - _needShow = (e.keyCode == Common.UI.Keys.ALT && (!Common.Utils.ModalWindow.isVisible()) && _isDocReady); + _needShow = (e.keyCode == Common.UI.Keys.ALT && (!Common.Utils.ModalWindow.isVisible()) && _isDocReady && _arrAlphabet.length > 0); }); }; diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 950979fed..57a72c501 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -155,7 +155,7 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.DOCM || fileType=="docm") { %>', - '
', + '
', '', '
', '<% } %>', @@ -912,14 +912,14 @@ define([ '
', '<% if (blank) { %> ', '
', - '
', + '
', '', '
', '
<%= scope.txtBlank %>
', '
', '<% } %>', '<% _.each(docs, function(item, index) { %>', - '
', + '
', '
', ' style="background-image: url(<%= item.image %>);">', diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index bf31a827b..692d8e3b0 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -442,7 +442,9 @@ define([ parentEl: $('#table-btn-distrub-rows', me.$el), cls: 'btn-toolbar', iconCls: 'toolbar__icon distribute-rows', - hint: this.textDistributeRows + hint: this.textDistributeRows, + dataHint: '1', + dataHintDirection: 'top' }); this.lockedControls.push(this.btnDistributeRows); this.btnDistributeRows.on('click', _.bind(function(btn){ @@ -453,7 +455,10 @@ define([ parentEl: $('#table-btn-distrub-cols', me.$el), cls: 'btn-toolbar', iconCls: 'toolbar__icon distribute-columns', - hint: this.textDistributeCols + hint: this.textDistributeCols, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnDistributeCols); this.btnDistributeCols.on('click', _.bind(function(btn){ @@ -471,7 +476,10 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon table-to-text', caption : this.textConvert, - style : 'width: 100%;text-align: left;' + style : 'width: 100%;text-align: left;', + dataHint : '1', + dataHintDirection: 'left', + dataHintOffset: 'medium' }); this.btnConvert.on('click', _.bind(this.onConvertTable, this)); this.lockedControls.push(this.btnConvert); diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 72c8db211..7aabc1d5b 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -143,7 +143,7 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.PPTM || fileType=="pptm") { %>', - '
', + '
', '', '
', '<% } %>', @@ -769,14 +769,14 @@ define([ '
', '<% if (blank) { %> ', '
', - '
', + '
', '', '
', '
<%= scope.txtBlank %>
', '
', '<% } %>', '<% _.each(docs, function(item, index) { %>', - '
', + '
', '
', ' style="background-image: url(<%= item.image %>);">', diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 1367681ec..255ed98cd 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -136,7 +136,7 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.XLSM || fileType=="xlsm") { %>', - '
', + '
', '', '
', '<% } %>', @@ -1736,14 +1736,14 @@ define([ '
', '<% if (blank) { %> ', '
', - '
', + '
', '', '
', '
<%= scope.txtBlank %>
', '
', '<% } %>', '<% _.each(docs, function(item, index) { %>', - '
', + '
', '
', ' style="background-image: url(<%= item.image %>);">',