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

[DE] Fix bug 55348

Browse source
This commit is contained in:
JuliaSvinareva 2022-02-04 19:21:48 +03:00
parent 4f4c02aefa
commit 85f994303f
3 changed files with 7 additions and 4 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});
} }

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'));

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'));