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

Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

Browse source
This commit is contained in:
Alexander Yuzhin 2017-01-25 11:24:01 +03:00
parent 627517cb5f 7bed3d0a8e
commit 03d35a4ea3
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/spreadsheeteditor/mobile/app/controller/CellEditor.js
View file

@ -170,10 +170,12 @@ define([
}, },
onInsertFunction: function() { onInsertFunction: function() {
if (this.mode == 'edit') {
SSE.getController('AddContainer').showModal({ SSE.getController('AddContainer').showModal({
panel: 'function', panel: 'function',
button: '#ce-function' button: '#ce-function'
}); });
} }
}
}); });
}); });

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

@ -161,7 +161,7 @@ define([
}, },
onApiShowPopMenu: function(posX, posY) { onApiShowPopMenu: function(posX, posY) {
// if ( !this.permitions.isEdit ) return; if ( !_isEdit ) return;
if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal-in').length > 0) { if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal-in').length > 0) {
return; return;