From 2c83af7e9ebc6b31d95d4bc91bf7b3ae1ec6dff5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Oct 2019 12:03:30 +0300 Subject: [PATCH 01/14] Fix bug with adding font to recent (font isn't in the font list) --- apps/common/main/lib/component/ComboBoxFonts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 6acff6762..8ef57414a 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -430,7 +430,7 @@ define([ }, addItemToRecent: function(record, silent) { - if (this.recent<1) return; + if (!record || this.recent<1) return; var font = this.store.findWhere({name: record.get('name'),type:FONT_TYPE_RECENT}); font && this.store.remove(font); From 22675ac1c8f59573985be728e7fd654911ed04e2 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 11 Oct 2019 10:45:56 +0300 Subject: [PATCH 02/14] [SSE] Fix Bug 43144 --- apps/spreadsheeteditor/main/app/controller/Print.js | 8 ++++---- apps/spreadsheeteditor/main/app/view/ScaleDialog.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index a36c3e98c..6a66e9270 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -141,10 +141,10 @@ define([ panel.cmbPaperSize.setValue(this.txtCustom + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')'); - var fitwidth = opt.asc_getFitToWidth(), - fitheight = opt.asc_getFitToHeight(), - fitscale = opt.asc_getScale(); - this.setScaling(panel, fitwidth, fitheight, fitscale); + this.fitWidth = opt.asc_getFitToWidth(); + this.fitHeight = opt.asc_getFitToHeight(); + this.fitScale = opt.asc_getScale(); + this.setScaling(panel, this.fitWidth, this.fitHeight, this.fitScale); item = panel.cmbPaperOrientation.store.findWhere({value: opt.asc_getOrientation()}); if (item) panel.cmbPaperOrientation.setValue(item.get('value')); diff --git a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js index b070b4087..c49e2704c 100644 --- a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js @@ -228,8 +228,8 @@ define([ this._state.width = (width !== null && width !== 0) ? width : null; this._state.height = (height !== null && height !== 0) ? height : null; - width = (width !== null) ? width : 0; - height = (height !== null) ? height : 0; + width = (width !== null && width !== undefined) ? width : 0; + height = (height !== null && height !== undefined) ? height : 0; if (width === 0 && height === 0) { this.radioScaleTo.setValue(true,true); @@ -248,7 +248,7 @@ define([ this.cmbScaleHeight.setRawValue(height.toString() + ' ' + this.getTextPages(height)); } - this.spnScale.setValue((scale !== null) ? scale : '', true); + this.spnScale.setValue((scale !== null && scale !== undefined) ? scale : '', true); } }, From a691eb6454ae8d73fe1b83558156ed0a37ec4b96 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 11 Oct 2019 10:59:16 +0300 Subject: [PATCH 03/14] Fix bug 43076, Bug 43119, Bug 43074 --- apps/common/main/lib/mods/perfect-scrollbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/mods/perfect-scrollbar.js b/apps/common/main/lib/mods/perfect-scrollbar.js index 778009db9..5397eb6c7 100644 --- a/apps/common/main/lib/mods/perfect-scrollbar.js +++ b/apps/common/main/lib/mods/perfect-scrollbar.js @@ -155,8 +155,8 @@ else $scrollbarYRail.css({top: $this.scrollTop(), right: scrollbarYRight - $this.scrollLeft(), height: scrollbarYRailHeight, display: scrollbarYActive ? "inherit": "none"}); - $scrollbarX.css({left: scrollbarXLeft, width: scrollbarXWidth}); - $scrollbarY.css({top: scrollbarYTop, height: scrollbarYHeight}); + $scrollbarX && $scrollbarX.css({left: scrollbarXLeft, width: scrollbarXWidth}); + $scrollbarY && $scrollbarY.css({top: scrollbarYTop, height: scrollbarYHeight}); }; var updateBarSizeAndPosition = function () { From b88568801e77d375e308878f1d0aabc085220f63 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 11 Oct 2019 13:22:07 +0300 Subject: [PATCH 04/14] [PE] Resize slide menu on first opening --- apps/presentationeditor/main/app/view/Toolbar.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index ee4c99e5c..6184c11ba 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1520,6 +1520,7 @@ define([ if (change && this.mnuSlidePicker) picker.options.layout_index = this.mnuSlidePicker.options.layout_index; this.mnuSlidePicker = picker; + this.mnuSlidePicker._needRecalcSlideLayout = true; }; me.btnsAddSlide.concat(me.btnChangeSlide).forEach(function (btn, index) { btn.menu.on('show:before', me.binding.onShowBeforeAddSlide, btn); From e94e6e226841fe7ab03632f6e9ba5c13e6726667 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 11 Oct 2019 13:44:26 +0300 Subject: [PATCH 05/14] [SSE] Remove locking when moving tabs --- apps/common/main/lib/component/TabBar.js | 10 ++++------ .../spreadsheeteditor/main/app/controller/Statusbar.js | 4 ++-- apps/spreadsheeteditor/main/app/view/Statusbar.js | 8 ++++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 27d120875..85c1dafde 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -391,12 +391,10 @@ define([ }, this.bar), mousedown: $.proxy(function (e) { if (this.bar.options.draggable && !_.isUndefined(dragHelper) && (3 !== e.which)) { - if (!tab.isLockTheDrag) { - if (this.bar.selectTabs.length > 1) { - dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs); - } else { - dragHelper.setHook(e, this.bar, tab); - } + if (this.bar.selectTabs.length > 1) { + dragHelper.setHookTabs(e, this.bar, this.bar.selectTabs); + } else { + dragHelper.setHook(e, this.bar, tab); } } }, this) diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 3c8523651..4e5b7beac 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -169,7 +169,7 @@ define([ tab = this.statusbar.tabbar.getAt(i); if (index == tab.sheetindex) { tab[locked?'addClass':'removeClass']('coauth-locked'); - tab.isLockTheDrag = locked || (this.statusbar.rangeSelectionMode==Asc.c_oAscSelectionDialogType.FormatTable); + //tab.isLockTheDrag = locked || (this.statusbar.rangeSelectionMode==Asc.c_oAscSelectionDialogType.FormatTable); break; } } @@ -240,7 +240,7 @@ define([ if (item.sheetindex !== currentIdx) { item.disable(mode==Asc.c_oAscSelectionDialogType.FormatTable); } - item.isLockTheDrag = (item.hasClass('coauth-locked') || (mode!=Asc.c_oAscSelectionDialogType.None)); + //item.isLockTheDrag = (item.hasClass('coauth-locked') || (mode!=Asc.c_oAscSelectionDialogType.None)); } this.statusbar.rangeSelectionMode = mode; }, diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index d487ea112..19997ffa2 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -329,7 +329,7 @@ define([ label : me.api.asc_getWorksheetName(i), // reorderable : !locked, cls : locked ? 'coauth-locked':'', - isLockTheDrag : locked +// isLockTheDrag : locked }; this.api.asc_isWorksheetHidden(i)? hidentems.push(tab) : items.push(tab); @@ -434,7 +434,7 @@ define([ this.tabMenu.items[1].setDisabled(issheetlocked); this.tabMenu.items[2].setDisabled(issheetlocked); this.tabMenu.items[3].setDisabled(issheetlocked); - this.tabMenu.items[4].setDisabled(issheetlocked); + this.tabMenu.items[4].setDisabled(isdoclocked); this.tabMenu.items[5].setDisabled(issheetlocked); this.tabMenu.items[6].setDisabled(isdoclocked); this.tabMenu.items[7].setDisabled(issheetlocked); @@ -445,8 +445,8 @@ define([ this.tabMenu.items[10].show(); } - this.tabMenu.items[9].setDisabled(issheetlocked); - this.tabMenu.items[10].setDisabled(issheetlocked); + this.tabMenu.items[9].setDisabled(isdoclocked); + this.tabMenu.items[10].setDisabled(isdoclocked); this.api.asc_closeCellEditor(); this.api.asc_enableKeyEvents(false); From 64c3756423cf2100a19428442d69a569298129ec Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 11 Oct 2019 14:00:16 +0300 Subject: [PATCH 06/14] [PE] Fix loader for presenter view --- apps/presentationeditor/main/index.reporter.html | 7 +++---- apps/presentationeditor/main/index.reporter.html.deploy | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/presentationeditor/main/index.reporter.html b/apps/presentationeditor/main/index.reporter.html index c6206fa7a..cf128b2ae 100644 --- a/apps/presentationeditor/main/index.reporter.html +++ b/apps/presentationeditor/main/index.reporter.html @@ -70,13 +70,12 @@ flex-grow: 1; max-width: 1350px; width: 100%; - margin: 0 auto 56px; } .loadmask > .placeholder .slide-v { display: flex; position: relative; flex-direction: column; - padding-bottom: 56.1333%; + padding-bottom: 80%; } .loadmask > .placeholder .slide-container { @@ -105,7 +104,7 @@ .loadmask > .placeholder .slide-container > .line:nth-child(1) { height: 30%; - margin: 120px 80px 0; + margin: 80px 80px 0; } @keyframes flickerAnimation { @@ -203,7 +202,7 @@ -
+