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

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

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2022-02-07 16:54:43 +03:00 committed by GitHub
parent 7fce35c7d9 1403deb086
commit fe722413f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -276,6 +276,7 @@ define([
me.delayRenderTips = me.options.delayRenderTips || false; me.delayRenderTips = me.options.delayRenderTips || false;
if (me.parentMenu) if (me.parentMenu)
me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0); me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0);
me.delaySelect = me.options.delaySelect || false;
me.rendered = false; me.rendered = false;
me.dataViewItems = []; me.dataViewItems = [];
if (me.options.keyMoveDirection=='vertical') if (me.options.keyMoveDirection=='vertical')
@ -396,10 +397,10 @@ define([
}); });
if (record) { if (record) {
if (Common.Utils.isSafari) { if (this.delaySelect) {
setTimeout(function () { setTimeout(function () {
record.set({selected: true}); record.set({selected: true});
}, 200); }, 300);
} else { } else {
record.set({selected: true}); record.set({selected: true});
} }

1
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -775,6 +775,7 @@ define([
this.api.asc_enableKeyEvents(true); this.api.asc_enableKeyEvents(true);
} else if (this.leftMenu.btnThumbnails.isActive()) { } else if (this.leftMenu.btnThumbnails.isActive()) {
this.leftMenu.btnThumbnails.toggle(false); this.leftMenu.btnThumbnails.toggle(false);
this.leftMenu.panelThumbnails.hide();
this.leftMenu.onBtnMenuClick(this.leftMenu.btnThumbnails); this.leftMenu.onBtnMenuClick(this.leftMenu.btnThumbnails);
} }
} }

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

@ -17,7 +17,7 @@
<div id="left-panel-chat" class="" style="display: none;"></div> <div id="left-panel-chat" class="" style="display: none;"></div>
<!-- /** coauthoring end **/ --> <!-- /** coauthoring end **/ -->
<div id="left-panel-navigation" class="" style="display: none; height: 100%;"></div> <div id="left-panel-navigation" class="" style="display: none; height: 100%;"></div>
<div id="left-panel-plugins" class="" style="display: none; height: 100%;"></div>
<div id="left-panel-thumbnails" class="" style="display: none; height: 100%;"></div> <div id="left-panel-thumbnails" class="" style="display: none; height: 100%;"></div>
<div id="left-panel-plugins" class="" style="display: none; height: 100%;"></div>
</div> </div>
</div> </div>

3
apps/documenteditor/main/app/view/ChartSettings.js
View file

@ -276,7 +276,8 @@ define([
groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'), itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'),
delayRenderTips: true delayRenderTips: true,
delaySelect: Common.Utils.isSafari
}); });
}); });
this.btnChartType.render($('#chart-button-type')); this.btnChartType.render($('#chart-button-type'));

4
apps/documenteditor/main/app/view/LeftMenu.js
View file

@ -329,6 +329,10 @@ define([
this.panelNavigation['hide'](); this.panelNavigation['hide']();
this.btnNavigation.toggle(false, true); this.btnNavigation.toggle(false, true);
} }
if (this.panelThumbnails) {
this.panelThumbnails['hide']();
this.btnThumbnails.toggle(false, true);
}
} }
}, },

2
apps/documenteditor/main/resources/less/layout.less
View file

@ -19,8 +19,6 @@ body {
} }
#viewport { #viewport {
overflow: scroll;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 0; width: 0;
height: 0; height: 0;

3
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -227,7 +227,8 @@ define([
groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'), itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'),
delayRenderTips: true delayRenderTips: true,
delaySelect: Common.Utils.isSafari
}); });
}); });
this.btnChartType.render($('#chart-button-type')); this.btnChartType.render($('#chart-button-type'));

3
apps/presentationeditor/main/resources/less/layout.less
View file

@ -19,8 +19,6 @@ body {
} }
#viewport { #viewport {
overflow: scroll;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 0; width: 0;
height: 0; height: 0;
@ -29,7 +27,6 @@ body {
#viewport-vbox-layout { #viewport-vbox-layout {
.layout-item:nth-child(3) { .layout-item:nth-child(3) {
overflow: scroll;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 0; width: 0;

2
apps/spreadsheeteditor/main/resources/less/layout.less
View file

@ -13,8 +13,6 @@ body {
bottom: 0; bottom: 0;
#viewport { #viewport {
overflow: auto;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 0; width: 0;
height: 0; height: 0;