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

Merge pull request #471 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-08-18 19:32:10 +03:00 committed by GitHub
parent bccfd639ab 0711da7860
commit ce7e5eb5a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ define([
}; };
function onTabDblclick(e) { function onTabDblclick(e) {
var tab = $(e.target).data('tab'); var tab = $(e.currentTarget).find('> a[data-tab]').data('tab');
if ( this.dblclick_el == tab ) if ( this.dblclick_el == tab )
this.fireEvent('change:compact', [tab]); this.fireEvent('change:compact', [tab]);
} }
@ -235,7 +235,6 @@ define([
onTabClick: function (e) { onTabClick: function (e) {
var me = this; var me = this;
var $target = $(e.currentTarget); var $target = $(e.currentTarget);
var tab = $target.find('> a[data-tab]').data('tab'); var tab = $target.find('> a[data-tab]').data('tab');
var islone = $target.hasClass('x-lone'); var islone = $target.hasClass('x-lone');
@ -245,8 +244,12 @@ define([
// me.fireEvent('') // me.fireEvent('')
} else } else
if ( $target.hasClass('active') ) { if ( $target.hasClass('active') ) {
me.collapse(); !me._timerSetTab && me.collapse();
} else { } else {
me._timerSetTab = true;
setTimeout(function(){
me._timerSetTab = false;
}, 500);
me.setTab(tab); me.setTab(tab);
me.processPanelVisible(null, true); me.processPanelVisible(null, true);
} }

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1701,7 +1701,7 @@ define([
documentHolder.mnuChartEdit.chartInfo = elValue; documentHolder.mnuChartEdit.chartInfo = elValue;
ischartmenu = true; ischartmenu = true;
has_chartprops = true; has_chartprops = true;
} if ( elValue.asc_getSlicerProperties() ) { } else if ( elValue.asc_getSlicerProperties() ) {
documentHolder.mnuSlicerAdvanced.imageInfo = elValue; documentHolder.mnuSlicerAdvanced.imageInfo = elValue;
isslicermenu = true; isslicermenu = true;
} else { } else {