diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js
index 170eb68ab..bbe807a2f 100644
--- a/apps/common/main/lib/component/HintManager.js
+++ b/apps/common/main/lib/component/HintManager.js
@@ -446,7 +446,8 @@ Common.UI.HintManager = new(function() {
}
}, 10);
} else {
- var curLetter = null;
+ var curLetter = null,
+ match = false;
var keyCode = e.keyCode;
if (keyCode !== 16 && keyCode !== 17 && keyCode !== 18 && keyCode !== 91) {
curLetter = _lang === 'en' ? ((keyCode > 47 && keyCode < 58 || keyCode > 64 && keyCode < 91) ? String.fromCharCode(e.keyCode) : null) : e.key;
@@ -462,9 +463,16 @@ Common.UI.HintManager = new(function() {
_inputLetters = _inputLetters + curLetter.toUpperCase();
for (var i = 0; i < _currentControls.length; i++) {
var item = _currentControls[i];
- if (!_isItemDisabled(item) && item.attr('data-hint-title') === _inputLetters) {
- curr = item;
- break;
+ if (!_isItemDisabled(item)) {
+ var title = item.attr('data-hint-title'),
+ regExp = new RegExp('^' + _inputLetters + '');
+ if (regExp.test(title)) {
+ match = true;
+ }
+ if (title === _inputLetters) {
+ curr = item;
+ break;
+ }
}
}
if (curr) {
@@ -501,7 +509,8 @@ Common.UI.HintManager = new(function() {
}
if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' ||
curr.closest('.btn-slot').prop('id') === 'slot-btn-mode' || curr.prop('id') === 'btn-favorite' || curr.parent().prop('id') === 'tlb-box-users' ||
- curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about') {
+ curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about' ||
+ curr.prop('id') === 'left-btn-support') {
_resetToDefault();
return;
}
@@ -516,6 +525,9 @@ Common.UI.HintManager = new(function() {
if (curr.parent().prop('id') === 'slot-btn-chat') {
_nextLevel(1);
_setCurrentSection(undefined, $('#left-menu.hint-section'));
+ } else if (curr.prop('id') === 'id-right-menu-signature') {
+ _nextLevel(2);
+ _setCurrentSection(curr);
} else {
_nextLevel();
_setCurrentSection(curr);
@@ -526,6 +538,8 @@ Common.UI.HintManager = new(function() {
}
}
}
+ } else if (!match) {
+ _inputLetters = '';
}
}
}
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index aa6187883..54a9acbde 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -1169,7 +1169,7 @@ define([
this.lblApplication = $markup.findById('#id-info-appname');
this.tblAuthor = $markup.findById('#id-info-author table');
this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
- this.authorTpl = '
|
';
+ this.authorTpl = ' |
';
this.tblAuthor.on('click', function(e) {
var btn = $markup.find(e.target);
@@ -1848,8 +1848,8 @@ define([
' | ',
'',
'',
- ' | ',
- ' | ',
+ ' | ',
+ ' | ',
'
',
''
].join(''));
diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js
index 4f79415cf..a63cf2628 100644
--- a/apps/documenteditor/main/app/view/FormSettings.js
+++ b/apps/documenteditor/main/app/view/FormSettings.js
@@ -214,13 +214,19 @@ define([
this.chAutofit = new Common.UI.CheckBox({
el: $markup.findById('#form-chb-autofit'),
- labelText: this.textAutofit
+ labelText: this.textAutofit,
+ dataHint: '1',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
this.chAutofit.on('change', this.onChAutofit.bind(this));
this.chMulti = new Common.UI.CheckBox({
el: $markup.findById('#form-chb-multiline'),
- labelText: this.textMulti
+ labelText: this.textMulti,
+ dataHint: '1',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
this.chMulti.on('change', this.onChMulti.bind(this));
@@ -401,7 +407,10 @@ define([
this.chAspect = new Common.UI.CheckBox({
el: $markup.findById('#form-chb-aspect'),
- labelText: this.textAspect
+ labelText: this.textAspect,
+ dataHint: '1',
+ dataHintDirection: 'left',
+ dataHintOffset: 'small'
});
this.chAspect.on('change', this.onChAspect.bind(this));
@@ -413,7 +422,10 @@ define([
data: [{ displayValue: this.textAlways, value: Asc.c_oAscPictureFormScaleFlag.Always },
{ displayValue: this.textNever, value: Asc.c_oAscPictureFormScaleFlag.Never },
{ displayValue: this.textTooBig, value: Asc.c_oAscPictureFormScaleFlag.Bigger },
- { displayValue: this.textTooSmall, value: Asc.c_oAscPictureFormScaleFlag.Smaller }]
+ { displayValue: this.textTooSmall, value: Asc.c_oAscPictureFormScaleFlag.Smaller }],
+ dataHint: '1',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.cmbScale.setValue(Asc.c_oAscPictureFormScaleFlag.Always);
this.lockedControls.push(this.cmbScale);
@@ -1150,7 +1162,10 @@ define([
this.btnBGColor = new Common.UI.ColorButton({
parentEl: $('#form-background-color-btn'),
transparent: true,
- menu: true
+ menu: true,
+ dataHint: '1',
+ dataHintDirection: 'bottom',
+ dataHintOffset: 'big'
});
this.lockedControls.push(this.btnBGColor);
this.btnBGColor.on('color:select', _.bind(this.onColorBGSelect, this));
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 7f1c7992d..3539d06ff 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -994,7 +994,7 @@ define([
this.lblApplication = $markup.findById('#id-info-appname');
this.tblAuthor = $markup.findById('#id-info-author table');
this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
- this.authorTpl = ' |
';
+ this.authorTpl = ' |
';
this.tblAuthor.on('click', function(e) {
var btn = $markup.find(e.target);
@@ -1584,8 +1584,8 @@ define([
' | ',
'',
'',
- ' | ',
- ' | ',
+ ' | ',
+ ' | ',
'
',
''
].join(''));
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 842243220..2701f9656 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -1957,7 +1957,7 @@ define([
this.lblApplication = $markup.findById('#id-info-appname');
this.tblAuthor = $markup.findById('#id-info-author table');
this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
- this.authorTpl = ' |
';
+ this.authorTpl = ' |
';
this.tblAuthor.on('click', function(e) {
var btn = $markup.find(e.target);
@@ -2546,8 +2546,8 @@ define([
' | ',
'',
'',
- ' | ',
- ' | ',
+ ' | ',
+ ' | ',
'
',
''
].join(''));