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

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

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2022-06-14 21:09:21 +03:00 committed by GitHub
parent 83e174c0e1 f8c92f4b70
commit 02cff6f9d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -568,7 +568,7 @@ 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-support') {
curr.prop('id') === 'left-btn-support' || curr.closest('.btn-slot').prop('id') === 'slot-btn-search') {
_resetToDefault();
return;
}

16
apps/common/main/lib/view/Plugins.js
View file

@ -60,11 +60,11 @@ define([
'</div>',
'</div>',
'<div id="current-plugin-box" class="layout-ct vbox hidden">',
'<div id="current-plugin-frame" class="">',
'</div>',
'<div id="current-plugin-header">',
'<label></label>',
'<div id="id-plugin-close" class="tool close"></div>',
'</div>',
'<div id="current-plugin-frame" class="">',
'<div id="id-plugin-close" class="close"></div>',
'</div>',
'</div>',
'<div id="plugins-mask" style="display: none;">'
@ -111,6 +111,13 @@ define([
this.currentPluginPanel = $('#current-plugin-box');
this.currentPluginFrame = $('#current-plugin-frame');
this.pluginClose = new Common.UI.Button({
parentEl: $('#id-plugin-close'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-close',
hint: this.textClosePanel
});
this.pluginMenu = new Common.UI.Menu({
menuAlign : 'tr-br',
items: []
@ -426,7 +433,8 @@ define([
textLoading: 'Loading',
textStart: 'Start',
textStop: 'Stop',
groupCaption: 'Plugins'
groupCaption: 'Plugins',
textClosePanel: 'Close plugin'
}, Common.Views.Plugins || {}));
});

29
apps/common/main/resources/less/plugins.less
View file

@ -80,17 +80,20 @@
#current-plugin-header {
position: absolute;
top: 0;
height: 45px;
left: 0;
width: 100%;
height: 38px;
padding: 10px 12px;
top: 0;
right: 0;
padding: 12px;
overflow: hidden;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar;
label {
width: 100%;
margin-top: 2px;
padding-right: 20px;
font-size: 12px;
.font-weight-bold();
overflow: hidden;
text-overflow: ellipsis;
@ -98,20 +101,18 @@
}
}
.tool {
.close {
position: absolute;
top: 9px;
right: 7px;
margin: 0;
/*&:before, &:after {
width: 2px;
width: @scaled-two-px-value;
}*/
width: 20px;
height: 20px;
top: 12px;
right: 12px;
}
#current-plugin-frame {
width: 100%;
height: 100%;
padding-top: 38px;
padding-top: 45px;
}
}

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -175,7 +175,7 @@ define([
{caption: me.textTabHome, action: 'home', extcls: 'canedit', dataHintTitle: 'H'},
{caption: me.textTabInsert, action: 'ins', extcls: 'canedit', dataHintTitle: 'I'},
{caption: me.textTabLayout, action: 'layout', extcls: 'canedit', layoutname: 'toolbar-layout', dataHintTitle: 'L'},
{caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'R'}
{caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'N'}
// undefined, undefined, undefined, undefined,
]
}

1
apps/documenteditor/main/locale/en.json
View file

@ -347,6 +347,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
"Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",

1
apps/presentationeditor/main/locale/en.json
View file

@ -449,6 +449,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
"Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",

6
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1317,7 +1317,11 @@ define([
},
searchShow: function () {
if (this.toolbar.btnSearch && this.searchBar && !this.searchBar.isVisible()) {
if (this.toolbar.btnSearch) {
if (this.searchBar && this.searchBar.isVisible()) {
this.searchBar.focus();
return;
}
this.toolbar.btnSearch.toggle(true);
}
},

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

@ -7,7 +7,7 @@
<div id="status-addtabs-box" class="status-group">
<button id="status-btn-addtab" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="X"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
<div class="cnt-tabslist">
<button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="V"><i class="icon toolbar__icon btn-sheet-list">&nbsp;</i></button>
<button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="N"><i class="icon toolbar__icon btn-sheet-list">&nbsp;</i></button>
</div>
</div>
<div id="status-zoom-box" class="status-group">

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -304,6 +304,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
"Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",