diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index faee293b4..521909397 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(); } diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html index 2b07d44e6..a8f46bea0 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 bfc07ebbe..9bc17c3b2 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 6aaff4404..d451768e3 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; @@ -208,10 +208,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}); @@ -222,9 +223,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 ff333c325..15dc7afa4 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 f969e310c..c7d4f973a 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 @@ - + diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 524e3baf7..d63640e0f 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -724,6 +724,7 @@ define([ case Asc.c_oAscAsyncAction.ForceSaveTimeout: clearTimeout(this._state.timerSave); force = true; + title = this.saveTitleText; text = (!this.appOptions.isOffline) ? this.saveTextText : ''; break;