Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #760 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-03-28 02:11:04 +03:00 committed by GitHub
parent 9e49bfa58c a0458a9c26
commit a0c9ac8ede
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/documenteditor/mobile/app/controller/edit/EditImage.js
View file

@ -196,11 +196,12 @@ define([
if (me.api) { if (me.api) {
var imgsize = me.api.get_OriginalSizeImage(), var imgsize = me.api.get_OriginalSizeImage(),
properties = new Asc.asc_CImgProperty(); properties = new Asc.asc_CImgProperty();
if (imgsize) {
properties.put_Width(imgsize.get_ImageWidth()); properties.put_Width(imgsize.get_ImageWidth());
properties.put_Height(imgsize.get_ImageHeight()); properties.put_Height(imgsize.get_ImageHeight());
properties.put_ResetCrop(true); properties.put_ResetCrop(true);
me.api.ImgApply(properties); me.api.ImgApply(properties);
}
} }
}, },

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1660,7 +1660,7 @@ define([
}, },
onDocumentMouseMove: function(e) { onDocumentMouseMove: function(e) {
if (e.target.localName !== 'canvas') { if (e && e.target.localName !== 'canvas') {
this.hideHyperlinkTip(); this.hideHyperlinkTip();
} }
}, },

2
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -82,7 +82,7 @@ define([
focus: function() { focus: function() {
var me = this; var me = this;
_.defer(function(){ _.defer(function(){
me.cmpEl.focus(); me.cmpEl && me.cmpEl.focus();
}, 50); }, 50);
}, },

8
apps/spreadsheeteditor/main/app/view/PivotSettings.js
View file

@ -415,8 +415,8 @@ define([
models[index].set({ models[index].set({
pivotIndex: pivotIndex, pivotIndex: pivotIndex,
index : index, index : index,
value : name, value : name || '',
tip : (name.length>10) ? name : '' tip : (name && name.length>10) ? name : ''
}); });
} else } else
arr.push(new Common.UI.DataViewModel({ arr.push(new Common.UI.DataViewModel({
@ -424,8 +424,8 @@ define([
allowSelected : false, allowSelected : false,
pivotIndex : pivotIndex, pivotIndex : pivotIndex,
index : index, index : index,
value : name, value : name || '',
tip : (name.length>10) ? name : '' tip : (name && name.length>10) ? name : ''
})); }));
isChecked[getNameFunction ? name : me._state.names[pivotIndex]] = true; isChecked[getNameFunction ? name : me._state.names[pivotIndex]] = true;
}); });