diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index c6f751d721..6963df699b 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -89,6 +89,7 @@ DE.ApplicationController = new(function(){ ttOffset[1] = 40; } + config.mode = 'view'; // always view for embedded config.canCloseEditor = false; var _canback = false; if (typeof config.customization === 'object') { diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index e6c5047638..f8d072e75a 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -86,6 +86,7 @@ PE.ApplicationController = new(function(){ $('#box-preview').addClass('top'); } + config.mode = 'view'; // always view for embedded config.canCloseEditor = false; var _canback = false; if (typeof config.customization === 'object') { diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 18284af7e9..9d263bbffb 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -174,8 +174,7 @@ define([ var me = this; Common.NotificationCenter.on({ 'window:show': function(e){ - me.screenTip.toolTip.hide(); - me.screenTip.isVisible = false; + me.hideScreenTip(); /** coauthoring begin **/ me.userTipHide(); /** coauthoring end **/ @@ -186,8 +185,7 @@ define([ me.hideTips(); }, 'layout:changed': function(e){ - me.screenTip.toolTip.hide(); - me.screenTip.isVisible = false; + me.hideScreenTip(); /** coauthoring begin **/ me.userTipHide(); /** coauthoring end **/ @@ -779,6 +777,11 @@ define([ } }, + hideScreenTip: function() { + this.screenTip.toolTip.hide(); + this.screenTip.isVisible = false; + }, + getUserName: function(id){ var usersStore = PE.getCollection('Common.Collections.Users'); if (usersStore){ @@ -1642,12 +1645,20 @@ define([ }, onInsertImage: function(placeholder, obj, x, y) { + if (placeholder) { + this.hideScreenTip(); + this.onHidePlaceholderActions(); + } if (this.api) (placeholder) ? this.api.asc_addImage(obj) : this.api.ChangeImageFromFile(); this.editComplete(); }, onInsertImageUrl: function(placeholder, obj, x, y) { + if (placeholder) { + this.hideScreenTip(); + this.onHidePlaceholderActions(); + } var me = this; (new Common.Views.ImageFromUrlDialog({ handler: function(result, value) { @@ -1897,6 +1908,8 @@ define([ onClickPlaceholder: function(type, obj, x, y) { if (!this.api) return; + this.hideScreenTip(); + this.onHidePlaceholderActions(); if (type == AscCommon.PlaceholderButtonType.Video) { this.api.asc_AddVideo(obj); } else if (type == AscCommon.PlaceholderButtonType.Audio) { diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 2c82798582..33e3003e65 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -86,6 +86,7 @@ SSE.ApplicationController = new(function(){ $('.viewer').addClass('top'); } + config.mode = 'view'; // always view for embedded config.canCloseEditor = false; var _canback = false; if (typeof config.customization === 'object') {