diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..9737a044d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +# Change log +## 5.1.1 +### All Editors +* + +### Document Editor +* + +### Spreadsheet Editor +* + +### Presentation Editor +* diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index d5b8d9929..a0045ae27 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1413,7 +1413,7 @@ define([ documentHolder.pmiFilterCells.setVisible(iscellmenu && !iscelledit && !internaleditor); documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu) && !iscelledit && !internaleditor); documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||isinsparkline) && !iscelledit); - documentHolder.pmiInsFunction.setVisible(iscellmenu); + documentHolder.pmiInsFunction.setVisible(iscellmenu && !iscelledit); documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit && !internaleditor); if (isintable) { @@ -1443,7 +1443,7 @@ define([ documentHolder.ssMenu.items[17].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); documentHolder.pmiAddComment.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); /** coauthoring end **/ - documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu || isrowmenu || iscolmenu || isallmenu); + documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu && !iscelledit || isrowmenu || iscolmenu || isallmenu); documentHolder.pmiEntireHide.isrowmenu = isrowmenu; documentHolder.pmiEntireShow.isrowmenu = isrowmenu; diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index a48462ceb..2a2fd26c2 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3006,7 +3006,7 @@ define([ }, applyFormulaSettings: function() { - if (this.toolbar.rendered) { + if (this.toolbar.btnInsertFormula.rendered) { var formulas = this.toolbar.btnInsertFormula.menu.items; for (var i=0; i