Commit cf826c04 authored by Alexey Golubev's avatar Alexey Golubev Committed by GitHub

Merge pull request #93 from ONLYOFFICE/feature/pre5.0.3

[SSE] Fix Bug 28388.
parents b81542d3 021ef020
......@@ -1229,7 +1229,7 @@ define([
onSelectionChanged: function(info){
if (!this.mouse.isLeftButtonDown && !this.rangeSelectionMode &&
this.currentMenu && this.currentMenu.isVisible()){
(this.permissions.isEdit) ? this.fillMenuProps(info, true, event) : this.fillViewMenuProps(info, true, event);
(this.permissions.isEdit) ? this.fillMenuProps(info, true) : this.fillViewMenuProps(info, true);
}
},
......@@ -1504,7 +1504,7 @@ define([
},
showPopupMenu: function(menu, value, event){
if (!_.isUndefined(menu) && menu !== null){
if (!_.isUndefined(menu) && menu !== null && event){
Common.UI.Menu.Manager.hideAll();
var me = this,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment