Merge pull request '[PE] Fix tooltips in fullscreen mode' (#47) from …

…fix/pe-tooltips into release/v8.2.0
ONLYOFFICE · Sep 27, 2024 · 6e39d34 · 6e39d34
2 parents 29ec59f + 0633717
commit 6e39d34
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
@@ -847,7 +847,8 @@ define([
                             html: !!isHtml,
                             title       : (typeof me.options.hint == 'string') ? me.options.hint : me.options.hint[0],
                             placement   : me.options.hintAnchor||'cursor',
-                            zIndex : tipZIndex
+                            zIndex : tipZIndex,
+                            container   : me.options.hintContainer
                         });
                         !Common.Utils.isGecko && (me.btnEl.data('bs.tooltip').enabled = !me.disabled);
                         me.btnEl.mouseenter();
@@ -857,7 +858,8 @@ define([
                             html: !!isHtml,
                             title       : me.options.hint[1],
                             placement   : me.options.hintAnchor||'cursor',
-                            zIndex : tipZIndex
+                            zIndex : tipZIndex,
+                            container   : me.options.hintContainer
                         });
                         !Common.Utils.isGecko && (me.btnMenuEl.data('bs.tooltip').enabled = !me.disabled);
                         me.btnMenuEl.mouseenter();
@@ -867,13 +869,15 @@ define([
                         html: !!isHtml,
                         title       : (typeof this.options.hint == 'string') ? this.options.hint : this.options.hint[0],
                         placement   : this.options.hintAnchor||'cursor',
-                        zIndex      : tipZIndex
+                        zIndex      : tipZIndex,
+                        container   : this.options.hintContainer
                     });
                     this.btnMenuEl && this.btnMenuEl.tooltip({
                         html: !!isHtml,
                         title       : this.options.hint[1],
                         placement   : this.options.hintAnchor||'cursor',
-                        zIndex      : tipZIndex
+                        zIndex      : tipZIndex,
+                        container   : this.options.hintContainer
                     });
                 }
                 if (modalParents.length > 0) {

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -995,6 +995,7 @@ define([
                         screenTip.strTip = ToolTip;
                         screenTip.tipType = type;
                         recalc = true;
+                        screenTip.toolTip.getBSTip().options.container = me.isPreviewVisible ? '#pe-preview' : 'body';
                     }
 
                     showPoint = [moveData.get_X(), moveData.get_Y()];

diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js
@@ -108,7 +108,8 @@ define([
             this.btnPrev = new Common.UI.Button({
                 el: $('#btn-preview-prev',this.el),
                 hint: this.txtPrev,
-                hintAnchor: 'top'
+                hintAnchor: 'top',
+                hintContainer: '#pe-preview'
             });
             this.btnPrev.on('click', _.bind(function() {
                 if (this.api) this.api.DemonstrationPrevSlide();
@@ -117,7 +118,8 @@ define([
             this.btnNext = new Common.UI.Button({
                 el: $('#btn-preview-next',this.el),
                 hint: this.txtNext,
-                hintAnchor: 'top'
+                hintAnchor: 'top',
+                hintContainer: '#pe-preview'
             });
             this.btnNext.on('click', _.bind(function() {
                 if (this.api) this.api.DemonstrationNextSlide();
@@ -126,7 +128,8 @@ define([
             this.btnPlay = new Common.UI.Button({
                 el: $('#btn-preview-play',this.el),
                 hint: this.txtPlay,
-                hintAnchor: 'top'
+                hintAnchor: 'top',
+                hintContainer: '#pe-preview'
             });
             this.btnPlay.on('click', _.bind(function(btn) {
                 var iconEl = $('.icon', this.btnPlay.cmpEl);
@@ -146,7 +149,8 @@ define([
             this.btnClose = new Common.UI.Button({
                 el: $('#btn-preview-close',this.el),
                 hint: this.txtClose,
-                hintAnchor: 'top'
+                hintAnchor: 'top',
+                hintContainer: '#pe-preview'
             });
             this.btnClose.on('click', _.bind(function() {
                 if (this.api) this.api.EndDemonstration();
@@ -155,7 +159,8 @@ define([
             this.btnFullScreen = new Common.UI.Button({
                 el: $('#btn-preview-fullscreen',this.el),
                 hint: this.txtFullScreen,
-                hintAnchor: 'top'
+                hintAnchor: 'top',
+                hintContainer: '#pe-preview'
             });
             this.btnFullScreen.on('click', _.bind(function(btn) {
                 this.toggleFullScreen();