diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js
index ae7d39210c..722029bc56 100644
--- a/apps/documenteditor/main/app/controller/DocumentHolder.js
+++ b/apps/documenteditor/main/app/controller/DocumentHolder.js
@@ -1227,6 +1227,7 @@ define([
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.overwriteCells] = documentHolder.txtOverwriteCells;
pasteContainer = $('
');
+ !Common.Utils.isIE && pasteContainer.addClass('overflow-hidden');
documentHolder.cmpEl.find('#id_main_view').append(pasteContainer);
me.btnSpecialPaste = new Common.UI.Button({
@@ -2489,6 +2490,7 @@ define([
eqStr += '';
eqStr += '';
eqContainer = $(eqStr);
+ !Common.Utils.isIE && eqContainer.addClass('overflow-hidden');
documentHolder.cmpEl.find('#id_main_view').append(eqContainer);
var onShowBefore = function (menu) {
var index = menu.options.value,
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 55a8be1f16..8d818b62b2 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -599,7 +599,7 @@ define([
this.pictureMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
initMenu: function(value){
if (_.isUndefined(value.imgProps))
@@ -1250,7 +1250,7 @@ define([
this.tableMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
initMenu: function(value){
// table properties
@@ -1855,7 +1855,7 @@ define([
this.textMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
initMenu: function(value){
var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties()));
diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index 0fd7ad53d6..5b6862fe6a 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -1772,7 +1772,7 @@ define([
style: "width:100%;",
menu: new Common.UI.Menu({
style: 'min-width: 194px;',
- maxHeight: 200,
+ // maxHeight: 200,
cls: 'shifted-right',
items: [
{caption: this.textEditPoints, value: 0, iconCls: 'toolbar__icon btn-edit-points'},
@@ -1782,7 +1782,7 @@ define([
menuAlign: 'tl-tl',
cls: 'menu-shapes menu-change-shape',
items: [],
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
additionalAlign: function(menuRoot, left, top) {
menuRoot.css({left: left, top: Math.max($(me.el).parent().offset().top, Common.Utils.innerHeight() - 10 - me.shapeRestoreHeight) - parseInt(menuRoot.css('margin-top'))});
}
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index bb8cd76360..324a679f18 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -208,8 +208,10 @@
border: @scaled-one-px-value solid @border-regular-control;
border-radius: 3px;
- overflow: hidden;
box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.2);
+ &.overflow-hidden {
+ overflow: hidden;
+ }
}
#equation-container {
diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index b8a6d5eddc..0f7c93abc6 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -1344,6 +1344,7 @@ define([
pasteContainer = $('');
+ !Common.Utils.isIE && pasteContainer.addClass('overflow-hidden');
documentHolder.cmpEl.append(pasteContainer);
me.btnSpecialPaste = new Common.UI.Button({
@@ -2526,6 +2527,7 @@ define([
eqStr += '';
eqStr += '';
eqContainer = $(eqStr);
+ !Common.Utils.isIE && eqContainer.addClass('overflow-hidden');
documentHolder.cmpEl.append(eqContainer);
var onShowBefore = function (menu) {
var index = menu.options.value,
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index cd5335a7da..c349d276d4 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -1000,7 +1000,7 @@ define([
me.slideMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
initMenu: function(value) {
var selectedLast = me.api.asc_IsLastSlideSelected(),
@@ -2125,7 +2125,7 @@ define([
me.tableMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
initMenu: function(value){
// table properties
@@ -2297,7 +2297,7 @@ define([
me.pictureMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
initMenu: function(value){
if (me.api) {
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index 50f591fe58..c2a98b5763 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -1637,7 +1637,7 @@ define([
style: "width:100%;",
menu: new Common.UI.Menu({
style: 'min-width: 194px;',
- maxHeight: 200,
+ // maxHeight: 200,
items: [
{caption: this.textEditPoints, value: 0, iconCls: 'toolbar__icon btn-edit-points'},
{
@@ -1646,7 +1646,7 @@ define([
menuAlign: 'tl-tl',
cls: 'menu-shapes menu-change-shape',
items: [],
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
additionalAlign: function(menuRoot, left, top) {
menuRoot.css({left: left, top: Math.max($(me.el).parent().offset().top, Common.Utils.innerHeight() - 10 - me.shapeRestoreHeight) - parseInt(menuRoot.css('margin-top'))});
}
diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
index 3516172df2..b2157e9bd7 100644
--- a/apps/presentationeditor/main/resources/less/toolbar.less
+++ b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -112,8 +112,10 @@
border: @scaled-one-px-value solid @border-regular-control;
border-radius: 3px;
- overflow: hidden;
box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.2);
+ &.overflow-hidden {
+ overflow: hidden;
+ }
}
#equation-container {
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index f599689832..97f35a0412 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -3579,6 +3579,7 @@ define([
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.useTextImport] = [me.txtUseTextImport, 3];
pasteContainer = $('');
+ !Common.Utils.isIE && pasteContainer.addClass('overflow-hidden');
documentHolderView.cmpEl.find('#ws-canvas-outer').append(pasteContainer);
me.btnSpecialPaste = new Common.UI.Button({
@@ -4837,6 +4838,7 @@ define([
eqStr += '';
eqStr += '';
eqContainer = $(eqStr);
+ !Common.Utils.isIE && eqContainer.addClass('overflow-hidden');
documentHolder.cmpEl.append(eqContainer);
var onShowBefore = function (menu) {
var index = menu.options.value,
diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
index 22693ee9a4..3b56ede6a0 100644
--- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
@@ -788,7 +788,7 @@ define([
me.ssMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
id : 'id-context-menu-cell',
items : [
@@ -1102,7 +1102,7 @@ define([
this.imgMenu = new Common.UI.Menu({
cls: 'shifted-right',
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
scrollToCheckedItem: false,
items: [
me.pmiImgCut,
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
index 36168b8115..5fbd0e0ec4 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
@@ -1652,7 +1652,7 @@ define([
style: "width:100%;",
menu: new Common.UI.Menu({
style: 'min-width: 194px;',
- maxHeight: 200,
+ // maxHeight: 200,
items: [
{caption: this.textEditPoints, value: 0, iconCls: 'toolbar__icon btn-edit-points'},
{
@@ -1661,7 +1661,7 @@ define([
menuAlign: 'tl-tl',
cls: 'menu-shapes menu-change-shape',
items: [],
- restoreHeightAndTop: true,
+ restoreHeightAndTop: !Common.Utils.isIE,
additionalAlign: function(menuRoot, left, top) {
menuRoot.css({left: left, top: Math.max($(me.el).parent().offset().top, Common.Utils.innerHeight() - 10 - me.shapeRestoreHeight) - parseInt(menuRoot.css('margin-top'))});
}
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index 83cc618279..374b746625 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -93,12 +93,14 @@
border: @scaled-one-px-value solid @border-regular-control;
border-radius: 3px;
- overflow: hidden;
box-shadow: 0 5px 15px -5px rgba(0, 0, 0, 0.2);
&.has-open-menu {
z-index: @zindex-navbar + 1;
}
+ &.overflow-hidden {
+ overflow: hidden;
+ }
}
#equation-container {