pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-26 11:19:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3012 from ONLYOFFICE/fix/bugfix

Browse Source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova
2024-05-27 20:50:57 +03:00
committed by GitHub
parent 54b1f0d2a1 8c7b94a0df
commit 3796f50d67
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/documenteditor/embed/js/ApplicationController.js
View File

@ -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') {

1
apps/presentationeditor/embed/js/ApplicationController.js
View File

@ -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') {

21
apps/presentationeditor/main/app/controller/DocumentHolder.js
View File

@ -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) {

1
apps/spreadsheeteditor/embed/js/ApplicationController.js
View File

@ -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') {