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

Merge pull request #1396 from ONLYOFFICE/fix/fix-bugs

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2021-12-07 17:19:38 +03:00 committed by GitHub
parent 37ae8429b6 4c9680bbd6
commit 0afd388801
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/main/lib/component/DataView.js
View file

@ -299,7 +299,8 @@ define([
this.cmpEl = $(this.template({
groups: me.groups ? me.groups.toJSON() : null,
style: me.style,
cls: me.cls
cls: me.cls,
options: me.options
}));
parentEl.html(this.cmpEl);
@ -308,7 +309,8 @@ define([
this.cmpEl.html(this.template({
groups: me.groups ? me.groups.toJSON() : null,
style: me.style,
cls: me.cls
cls: me.cls,
options: me.options
}));
}
@ -506,7 +508,8 @@ define([
$(this.el).html(this.template({
groups: this.groups ? this.groups.toJSON() : null,
style: this.style,
cls: this.cls
cls: this.cls,
options: this.options
}));
if (!_.isUndefined(this.scroller)) {

4
apps/common/main/lib/component/HintManager.js
View file

@ -500,6 +500,10 @@ Common.UI.HintManager = new(function() {
curr.trigger(jQuery.Event('click', {which: 1}));
curr.focus();
_resetToDefault();
} else if (curr.hasClass('listview')) {
_hideHints();
curr.focus();
_resetToDefault();
} else {
_isComplete = false;
_hideHints();

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

@ -59,7 +59,7 @@ define([
},
template: _.template([
'<div class="listview inner <%= cls %>"></div>'
'<div class="listview inner <%= cls %>" <% if (options.dataHint) { %> data-hint="<%= options.dataHint %>" <% } if (options.dataHintDirection) { %> data-hint-direction="<%= options.dataHintDirection %>" <% } if (options.dataHintOffset) { %> data-hint-offset="<%= options.dataHintOffset %>" <% } %>></div>'
].join('')),
onResetItems : function() {

1
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -720,6 +720,7 @@ define([
case Asc.c_oAscAsyncAction.ForceSaveTimeout:
clearTimeout(this._state.timerSave);
force = true;
title = this.saveTitleText;
text = (!this.appOptions.isOffline) ? this.saveTextText : '';
break;

2
apps/spreadsheeteditor/main/app/template/LeftMenu.template
View file

@ -6,7 +6,7 @@
<button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** coauthoring end **/ -->
<button id="left-btn-plugins" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button>
<button id="left-btn-spellcheck" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button>
<button id="left-btn-spellcheck" class="btn btn-category" content-target="left-panel-spellcheck" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
</div>

31
apps/spreadsheeteditor/main/app/view/Spellcheck.js
View file

@ -60,7 +60,7 @@ define([
'<div id="spellcheck-suggestions-list"></div>',
'<div id="spellcheck-change" style=""></div>',
'<div id="spellcheck-ignore" class="padding-large"></div>',
'<button class="btn btn-text-default auto" id="spellcheck-add-to-dictionary"><%= scope.txtAddToDictionary %></button>',
'<button class="btn btn-text-default auto" id="spellcheck-add-to-dictionary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtAddToDictionary %></button>',
'<label class="header" style="display: block;"><%= scope.txtDictionaryLanguage %></label>',
'<div id="spellcheck-dictionary-language"></div>',
'<div id="spellcheck-complete" class="hidden">',
@ -84,7 +84,10 @@ define([
el : $('#spellcheck-current-word'),
allowBlank : true,
validateOnBlur: false,
disabled: true
disabled: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'big'
});
this.buttonNext = new Common.UI.Button({
@ -92,14 +95,19 @@ define([
style: 'margin-left: 5px;',
cls: 'btn-toolbar bg-white',
iconCls: 'toolbar__icon btn-nextitem',
hint: this.txtNextTip
hint: this.txtNextTip,
dataHint: '1',
dataHintDirection: 'top'
});
this.suggestionList = new Common.UI.ListView({
el: $('#spellcheck-suggestions-list'),
emptyText: this.noSuggestions,
store: new Common.UI.DataViewStore(),
scrollAlwaysVisible: true
scrollAlwaysVisible: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'big'
});
this.btnChange = new Common.UI.Button({
@ -121,7 +129,10 @@ define([
value: 1
}
]
})
}),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
});
this.btnIgnore = new Common.UI.Button({
@ -143,7 +154,10 @@ define([
value: 1
}
]
})
}),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
});
this.cmbDictionaryLanguage = new Common.UI.ComboBox({
@ -155,7 +169,10 @@ define([
scroller : {
suppressScrollX: true
},
search: true
search: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
});
this.btnToDictionary = new Common.UI.Button({