From 097f1c7fc163f89d144bd2f1c79854ecc056ab2d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Dec 2021 19:57:04 +0300 Subject: [PATCH 1/2] [DE forms] Fix Bug 54317 --- .../documenteditor/forms/app/controller/ApplicationController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 4731a0c8e..5d2f7638d 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -108,6 +108,7 @@ define([ Common.Gateway.on('init', this.loadConfig.bind(this)); Common.Gateway.on('opendocument', this.loadDocument.bind(this)); Common.Gateway.on('showmessage', this.onExternalMessage.bind(this)); + Common.NotificationCenter.on('showmessage', this.onExternalMessage.bind(this)); Common.Gateway.appReady(); } From ddf2be862cbdc06992eb3d4263d73debe915d6ca Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Dec 2021 20:28:43 +0300 Subject: [PATCH 2/2] [Embed] Fix Bug 54128 --- apps/presentationeditor/embed/index.html | 2 +- apps/presentationeditor/embed/index.html.deploy | 2 +- apps/presentationeditor/embed/index_loader.html | 2 +- .../presentationeditor/embed/index_loader.html.deploy | 2 +- .../embed/js/ApplicationController.js | 11 +++++++---- apps/spreadsheeteditor/embed/index.html | 2 +- apps/spreadsheeteditor/embed/index.html.deploy | 2 +- apps/spreadsheeteditor/embed/index_loader.html | 2 +- apps/spreadsheeteditor/embed/index_loader.html.deploy | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html index c16fd838f..2243f656e 100644 --- a/apps/presentationeditor/embed/index.html +++ b/apps/presentationeditor/embed/index.html @@ -273,7 +273,7 @@ - + diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy index 540856471..882a0e8fd 100644 --- a/apps/presentationeditor/embed/index.html.deploy +++ b/apps/presentationeditor/embed/index.html.deploy @@ -267,7 +267,7 @@ - + diff --git a/apps/presentationeditor/embed/index_loader.html b/apps/presentationeditor/embed/index_loader.html index 5b3142e62..2ac2e8fb4 100644 --- a/apps/presentationeditor/embed/index_loader.html +++ b/apps/presentationeditor/embed/index_loader.html @@ -321,7 +321,7 @@ - + diff --git a/apps/presentationeditor/embed/index_loader.html.deploy b/apps/presentationeditor/embed/index_loader.html.deploy index f69ed41d9..574297d38 100644 --- a/apps/presentationeditor/embed/index_loader.html.deploy +++ b/apps/presentationeditor/embed/index_loader.html.deploy @@ -314,7 +314,7 @@ - + diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 4fb9ceda0..9fb45c2d0 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -41,7 +41,7 @@ PE.ApplicationController = new(function(){ maxPages = 0, created = false, currentPage = 0, - ttOffset = [0, -10], + ttOffset = [5, -10], labelDocName; var LoadingDocument = -256; @@ -206,10 +206,11 @@ PE.ApplicationController = new(function(){ $ttEl.tooltip({'container':'body', 'trigger':'manual'}); $ttEl.on('shown.bs.tooltip', function(e) { $tooltip = $ttEl.data('bs.tooltip').tip(); - + var pos = $ttEl.ttpos[1] - $tooltip.height() + ttOffset[1]; + (pos<0) && (pos = 0); $tooltip.css({ left: $ttEl.ttpos[0] + ttOffset[0], - top: $ttEl.ttpos[1] + ttOffset[1] + top: pos }); $tooltip.find('.tooltip-arrow').css({left: 10}); @@ -220,9 +221,11 @@ PE.ApplicationController = new(function(){ $ttEl.ttpos = [data.get_X(), data.get_Y()]; $ttEl.tooltip('show'); } else { + var pos = $ttEl.ttpos[1] - $tooltip.height() + ttOffset[1]; + (pos<0) && (pos = 0); $tooltip.css({ left:data.get_X() + ttOffset[0], - top:data.get_Y() + ttOffset[1] + top:pos }); } } diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html index 2e0f4617c..a5a975542 100644 --- a/apps/spreadsheeteditor/embed/index.html +++ b/apps/spreadsheeteditor/embed/index.html @@ -246,7 +246,7 @@ - + diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy index 5bced543e..43368764a 100644 --- a/apps/spreadsheeteditor/embed/index.html.deploy +++ b/apps/spreadsheeteditor/embed/index.html.deploy @@ -238,7 +238,7 @@ - + diff --git a/apps/spreadsheeteditor/embed/index_loader.html b/apps/spreadsheeteditor/embed/index_loader.html index 7e37cb96c..18b700b25 100644 --- a/apps/spreadsheeteditor/embed/index_loader.html +++ b/apps/spreadsheeteditor/embed/index_loader.html @@ -320,7 +320,7 @@ - + diff --git a/apps/spreadsheeteditor/embed/index_loader.html.deploy b/apps/spreadsheeteditor/embed/index_loader.html.deploy index 3459e52ad..d463a09fd 100644 --- a/apps/spreadsheeteditor/embed/index_loader.html.deploy +++ b/apps/spreadsheeteditor/embed/index_loader.html.deploy @@ -312,7 +312,7 @@ - +