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

Merge pull request #1384 from ONLYOFFICE/fix/presentation

Browse source 
[PE] Fix Bug 54127
This commit is contained in:
Julia Radzhabova 2021-12-04 23:12:37 +03:00 committed by GitHub
parent bc0564fe2e 7713fd33a3
commit f9ca39f6d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -439,6 +439,14 @@ define([
/** coauthoring end **/ /** coauthoring end **/
me.hideTips(); me.hideTips();
onDocumentHolderResize(); onDocumentHolderResize();
},
'preview:show': function(e){
me.isPreviewVisible = true;
screenTip && (screenTip.tipLength = -1); // redraw link tip
},
'preview:hide': function(e){
me.isPreviewVisible = false;
screenTip && (screenTip.tipLength = -1); // redraw link tip
} }
}); });
@ -508,7 +516,7 @@ define([
ToolTip = ToolTip.substr(0, 256) + '...'; ToolTip = ToolTip.substr(0, 256) + '...';
if (screenTip.tipLength !== ToolTip.length || screenTip.strTip.indexOf(ToolTip)<0 ) { if (screenTip.tipLength !== ToolTip.length || screenTip.strTip.indexOf(ToolTip)<0 ) {
screenTip.toolTip.setTitle(ToolTip + '<br><b>' + me.txtPressLink + '</b>'); screenTip.toolTip.setTitle(ToolTip + (me.isPreviewVisible ? '' : '<br><b>' + me.txtPressLink + '</b>'));
screenTip.tipLength = ToolTip.length; screenTip.tipLength = ToolTip.length;
screenTip.strTip = ToolTip; screenTip.strTip = ToolTip;
recalc = true; recalc = true;

2
apps/presentationeditor/main/app/view/DocumentPreview.js
View file

@ -308,6 +308,7 @@ define([
}, 1000); }, 1000);
$('#viewport-vbox-layout').css('z-index','0'); $('#viewport-vbox-layout').css('z-index','0');
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
Common.NotificationCenter.trigger('preview:show');
}, },
hide: function() { hide: function() {
@ -324,6 +325,7 @@ define([
this.$el.off('mousemove'); this.$el.off('mousemove');
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
Common.NotificationCenter.trigger('preview:hide');
}, },
setApi: function(o) { setApi: function(o) {