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

This commit is contained in:
Alexander Yuzhin 2017-01-25 11:24:01 +03:00
commit 03d35a4ea3
2 changed files with 7 additions and 5 deletions

View file

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

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;