Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE PE SSE] Add getStaticHint method instead of data-hint-desktop attr

Browse source
This commit is contained in:
JuliaSvinareva 2022-06-20 18:40:26 +03:00
parent 0c543de506
commit fe0ab8706b
2 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/Mixtbar.js
View file

@ -107,7 +107,7 @@ define([
'<% } %>' + '<% } %>' +
'<% } %>' + '<% } %>' +
'</ul>' + '</ul>' +
'<a class="scroll right" data-hint="0" data-hint-direction="bottom" data-hint-offset="-7, 0" data-hint-title="N"></a>' + '<a class="scroll right" data-hint="0" data-hint-direction="bottom" data-hint-offset="-7, 0" data-hint-title="R"></a>' +
'</section>'; '</section>';
this.$layout = $(options.template({ this.$layout = $(options.template({

61
apps/common/main/lib/controller/HintManager.js
View file

@ -44,7 +44,6 @@
* <button ... data-hint="1" data-hint-direction="right" data-hint-offset="big" data-hint-title="B">...</button> * <button ... data-hint="1" data-hint-direction="right" data-hint-offset="big" data-hint-title="B">...</button>
* <label ... data-hint="1" data-hint-direction="bottom" data-hint-offset="medium" data-hint-title="L">...</label> * <label ... data-hint="1" data-hint-direction="bottom" data-hint-offset="medium" data-hint-title="L">...</label>
* *
* data-hint-desktop // true/false
* *
* Example usage with components: * Example usage with components:
* *
@ -120,7 +119,10 @@ Common.UI.HintManager = new(function() {
_isDocReady = false, _isDocReady = false,
_isEditDiagram = false, _isEditDiagram = false,
_usedTitles = [], _usedTitles = [],
_appPrefix; _appPrefix,
_staticHints = { // for desktop buttons
"btnhome": 'K'
};
var _api; var _api;
@ -225,6 +227,15 @@ Common.UI.HintManager = new(function() {
return arr; return arr;
}; };
var _getLetterInUILanguage = function (letter) {
var l = letter;
if (_arrAlphabet.indexOf(l) === -1) {
var ind = _arrEnAlphabet.indexOf(l);
l = _arrAlphabet[ind];
}
return l;
};
var _isItemDisabled = function (item) { var _isItemDisabled = function (item) {
return (item.hasClass('disabled') || item.parent().hasClass('disabled') || item.attr('disabled')); return (item.hasClass('disabled') || item.parent().hasClass('disabled') || item.attr('disabled'));
}; };
@ -233,19 +244,15 @@ Common.UI.HintManager = new(function() {
_currentControls = []; _currentControls = [];
_usedTitles = []; _usedTitles = [];
var arr = [], var arr = [],
arrItemsWithTitle = [], arrItemsWithTitle = [];
arrItemsDesktop = [];
if (_.isArray(_currentSection)) { if (_.isArray(_currentSection)) {
_currentSection.forEach(function (section) { _currentSection.forEach(function (section) {
arr = arr.concat($(section).find('[data-hint=' + (_currentLevel) + ']').toArray()); arr = arr.concat($(section).find('[data-hint=' + (_currentLevel) + ']').toArray());
arrItemsWithTitle = arrItemsWithTitle.concat($(section).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray()); arrItemsWithTitle = arrItemsWithTitle.concat($(section).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray());
arrItemsDesktop = arrItemsWithTitle.concat($(section).find('[data-hint-title][data-hint-desktop="true"][data-hint=' + (_currentLevel) + ']').toArray());
}); });
} else { } else {
arr = $(_currentSection).find('[data-hint=' + (_currentLevel) + ']').toArray(); arr = $(_currentSection).find('[data-hint=' + (_currentLevel) + ']').toArray();
arrItemsWithTitle = $(_currentSection).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray(); arrItemsWithTitle = $(_currentSection).find('[data-hint-title][data-hint=' + (_currentLevel) + ']').toArray();
arrItemsDesktop = $(_currentSection).find('[data-hint-title][data-hint-desktop="true"][data-hint=' + (_currentLevel) + ']').toArray();
} }
var visibleItems = arr.filter(function (item) { var visibleItems = arr.filter(function (item) {
return $(item).is(':visible'); return $(item).is(':visible');
@ -274,31 +281,22 @@ Common.UI.HintManager = new(function() {
}); });
return; return;
} }
var getLetterInUILanguage = function (letter) {
var l = letter;
if (_arrAlphabet.indexOf(l) === -1) {
var ind = _arrEnAlphabet.indexOf(l);
l = _arrAlphabet[ind];
}
return l;
};
var _arrLetters = [], var _arrLetters = [],
_usedLetters = []; _usedLetters = [];
if (arrItemsDesktop.length > 0) { if (_currentLevel === 0) {
arrItemsDesktop.forEach(function (item) { for (var key in _staticHints) {
var t = $(item).data('hint-title').toLowerCase(); var t = _staticHints[key].toLowerCase();
t = getLetterInUILanguage(t);
_usedTitles.push(t); _usedTitles.push(t);
_usedLetters.push(_arrAlphabet.indexOf(t)); _usedLetters.push(_arrAlphabet.indexOf(t));
}); }
} }
if (visibleItems.length > _arrAlphabet.length) { if (visibleItems.length > _arrAlphabet.length) {
visibleItemsWithTitle.forEach(function (item) { visibleItemsWithTitle.forEach(function (item) {
var t = $(item).data('hint-title').toLowerCase(); var t = $(item).data('hint-title').toLowerCase();
t = getLetterInUILanguage(t); t = _getLetterInUILanguage(t);
_usedTitles.push(t); _usedTitles.push(t);
}); });
_arrLetters = _getLetters(visibleItems.length + arrItemsDesktop.length); _arrLetters = _getLetters(visibleItems.length + (_currentLevel === 0 ? _.size(_staticHints) : 0));
} else { } else {
_arrLetters = _arrAlphabet.slice(); _arrLetters = _arrAlphabet.slice();
} }
@ -319,7 +317,6 @@ Common.UI.HintManager = new(function() {
} }
}); });
} }
Common.NotificationCenter.trigger('hints:used-titles', _currentLevel, arrItemsDesktop.concat(visibleItemsWithTitle), _usedLetters, _arrLetters);
var index = 0; var index = 0;
visibleItems.forEach(function (item) { visibleItems.forEach(function (item) {
var el = $(item); var el = $(item);
@ -638,7 +635,16 @@ Common.UI.HintManager = new(function() {
_arrAlphabet = langsJson[lang]; _arrAlphabet = langsJson[lang];
return _arrAlphabet; return _arrAlphabet;
}; };
return !_setAlphabet(lng) ? (!_setAlphabet(lng.split(/[\-_]/)[0]) ? _setAlphabet('en') : true) : true; var loaded = !_setAlphabet(lng) ? (!_setAlphabet(lng.split(/[\-_]/)[0]) ? _setAlphabet('en') : true) : true;
if (loaded && _lang !== 'en') {
for (var key in _staticHints) {
var hint = _getLetterInUILanguage(_staticHints[key].toLowerCase());
if (hint) {
_staticHints[key] = hint.toUpperCase();
}
}
}
return loaded;
}); });
Common.Utils.loadConfig('../../common/main/resources/alphabetletters/qwertyletters.json', function (langsJson) { Common.Utils.loadConfig('../../common/main/resources/alphabetletters/qwertyletters.json', function (langsJson) {
_arrQwerty = langsJson[_lang]; _arrQwerty = langsJson[_lang];
@ -679,11 +685,16 @@ Common.UI.HintManager = new(function() {
_isEditDiagram = mode.isEditDiagram || mode.isEditMailMerge || mode.isEditOle; _isEditDiagram = mode.isEditDiagram || mode.isEditMailMerge || mode.isEditOle;
}; };
var _getStaticHint = function (key) {
return _staticHints[key];
};
return { return {
init: _init, init: _init,
setMode: _setMode, setMode: _setMode,
clearHints: _clearHints, clearHints: _clearHints,
needCloseFileMenu: _needCloseFileMenu, needCloseFileMenu: _needCloseFileMenu,
isHintVisible: _isHintVisible isHintVisible: _isHintVisible,
getStaticHint: _getStaticHint
} }
})(); })();