From 8a5f5c14bc4646e3e47fbd3e29c1e1c4807778a7 Mon Sep 17 00:00:00 2001 From: nikita_bartoshuk Date: Thu, 9 Oct 2025 00:22:18 +0300 Subject: [PATCH 1/9] fixed double dialog --- apps/pdfeditor/main/app/controller/RedactTab.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/pdfeditor/main/app/controller/RedactTab.js b/apps/pdfeditor/main/app/controller/RedactTab.js index 4f47e37294..e031014e32 100644 --- a/apps/pdfeditor/main/app/controller/RedactTab.js +++ b/apps/pdfeditor/main/app/controller/RedactTab.js @@ -58,6 +58,7 @@ define([ onLaunch: function () { this._state = {}; + this.redactionsWarningVisible = null; Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this)); @@ -190,7 +191,8 @@ define([ Common.UI.TooltipManager.closeTip('mark-for-redaction'); Common.UI.TooltipManager.closeTip('apply-redaction'); const isMarked = this.api.HasRedact(); - if (isMarked) { + if (isMarked && !this.redactionsWarningVisible) { + this.redactionsWarningVisible = true; Common.UI.warning({ width: 500, msg: this.textUnappliedRedactions, @@ -207,16 +209,19 @@ define([ this.api.ApplyRedact(); this.api.SetRedactTool(false); this.view.btnMarkForRedact.toggle(false); + this.redactionsWarningVisible = false; } else if (btn == 'doNotApply') { this.api.RemoveAllRedact(); this.api.SetRedactTool(false); this.view.btnMarkForRedact.toggle(false); + this.redactionsWarningVisible = false; } else if (btn == 'cancel') { if (this.mode.isPDFEdit) { this.toolbar.toolbar.setTab('red') } else { Common.NotificationCenter.trigger('pdf:mode-apply', 'edit', 'red'); } + this.redactionsWarningVisible = false; } }, this) }); From 2c28ae78f64ce26ee7d920de50ffd1f513f0c9e1 Mon Sep 17 00:00:00 2001 From: Konstantin Kireyev Date: Thu, 9 Oct 2025 12:54:26 +0500 Subject: [PATCH 2/9] fix vertical slider --- apps/common/main/resources/less/slider.less | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/common/main/resources/less/slider.less b/apps/common/main/resources/less/slider.less index 96021a1dee..afc565a72a 100644 --- a/apps/common/main/resources/less/slider.less +++ b/apps/common/main/resources/less/slider.less @@ -16,6 +16,7 @@ background-color: @slider-track-background-normal; border-radius: @slider-border-radius-ie; border-radius: @slider-border-radius; + width: 100%; width: calc(100% + @slider-thumb-size); margin-inline: (@slider-thumb-size-ie / -2); margin-inline: calc(@slider-thumb-size / -2); @@ -43,8 +44,8 @@ } .thumb { - top: calc((@slider-height-ie - @slider-thumb-size-ie) / 2); // implement fallback for ie: 3px - top: calc((@slider-height - @slider-thumb-size) / 2); // implement fallback for ie: 3px + top: calc((@slider-height-ie - @slider-thumb-size-ie) / 2); + top: calc((@slider-height - @slider-thumb-size) / 2); bottom: 0; transform: translateX(-50%); margin-left: 0; @@ -74,7 +75,9 @@ } &.vertical { - height: 100%; + margin-inline: 0; + margin-block: (@slider-thumb-size-ie / 2); + margin-block: calc(@slider-thumb-size / 2); width: @slider-height-ie; width: @slider-height; padding-top: 0; @@ -83,8 +86,12 @@ .track { position: absolute; height: 100%; + height: calc(100% + @slider-thumb-size); width: @slider-track-height-ie; width: @slider-track-height; + margin-inline: 0; + margin-block: (@slider-thumb-size-ie / -2); + margin-block: calc(@slider-thumb-size / -2); //&:before { // transform: translateX(-50%); From 2372d1dbe41e03efd23fd0d60a4ff20ffac35f58 Mon Sep 17 00:00:00 2001 From: nikita_bartoshuk Date: Thu, 9 Oct 2025 12:24:52 +0300 Subject: [PATCH 3/9] fixed menu file hiding --- apps/pdfeditor/main/app/controller/LeftMenu.js | 3 ++- apps/pdfeditor/main/app/controller/RedactTab.js | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/pdfeditor/main/app/controller/LeftMenu.js b/apps/pdfeditor/main/app/controller/LeftMenu.js index 0f6701c9e3..94648dd832 100644 --- a/apps/pdfeditor/main/app/controller/LeftMenu.js +++ b/apps/pdfeditor/main/app/controller/LeftMenu.js @@ -113,7 +113,8 @@ define([ 'search:showredact': _.bind(this.onShowHideRedactSearch, this) }, 'RedactTab': { - 'search:showredact': _.bind(this.onShowHideRedactSearch, this) + 'search:showredact': _.bind(this.onShowHideRedactSearch, this), + 'menu:hide': _.bind(this.clickToolbarTab, this, 'red') }, 'Common.Views.SearchPanel': { 'search:showredact': _.bind(this.onShowHideRedactSearch, this) diff --git a/apps/pdfeditor/main/app/controller/RedactTab.js b/apps/pdfeditor/main/app/controller/RedactTab.js index e031014e32..f50345bc2b 100644 --- a/apps/pdfeditor/main/app/controller/RedactTab.js +++ b/apps/pdfeditor/main/app/controller/RedactTab.js @@ -59,6 +59,7 @@ define([ this._state = {}; this.redactionsWarningVisible = null; + this.isFileMenuTab = null; Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this)); @@ -191,9 +192,11 @@ define([ Common.UI.TooltipManager.closeTip('mark-for-redaction'); Common.UI.TooltipManager.closeTip('apply-redaction'); const isMarked = this.api.HasRedact(); - if (isMarked && !this.redactionsWarningVisible) { - this.redactionsWarningVisible = true; - Common.UI.warning({ + if ( + isMarked && + (!this.redactionsWarningVisible || !this.redactionsWarningVisible.isVisible()) + ) { + this.redactionsWarningVisible = Common.UI.warning({ width: 500, msg: this.textUnappliedRedactions, buttons: [{ @@ -209,19 +212,19 @@ define([ this.api.ApplyRedact(); this.api.SetRedactTool(false); this.view.btnMarkForRedact.toggle(false); - this.redactionsWarningVisible = false; } else if (btn == 'doNotApply') { this.api.RemoveAllRedact(); this.api.SetRedactTool(false); this.view.btnMarkForRedact.toggle(false); - this.redactionsWarningVisible = false; } else if (btn == 'cancel') { + if (this.isFileMenuTab) { + this.view.fireEvent('menu:hide', [this]); + } if (this.mode.isPDFEdit) { this.toolbar.toolbar.setTab('red') } else { Common.NotificationCenter.trigger('pdf:mode-apply', 'edit', 'red'); } - this.redactionsWarningVisible = false; } }, this) }); @@ -230,6 +233,7 @@ define([ this.api.SetRedactTool(false); } } + this.isFileMenuTab = tab === 'file' ? true : false; }, onRedactionStateToggle: function(isRedaction) { From 664f5b19950750548b157c3ea6109ad113f30150 Mon Sep 17 00:00:00 2001 From: Denis Dokin Date: Thu, 9 Oct 2025 16:00:45 +0500 Subject: [PATCH 4/9] [icons] upload --- .../img/toolbar/1.25x/big/btn-table-alt-text.png | Bin 0 -> 197 bytes .../img/toolbar/1.5x/big/btn-table-alt-text.png | Bin 0 -> 198 bytes .../img/toolbar/1.75x/big/btn-table-alt-text.png | Bin 0 -> 183 bytes .../img/toolbar/1x/big/btn-table-alt-text.png | Bin 0 -> 186 bytes .../img/toolbar/2.5x/big/btn-table-alt-text.svg | 4 ++++ .../img/toolbar/2x/big/btn-table-alt-text.png | Bin 0 -> 242 bytes .../toolbar/v2/1.25x/big/btn-table-alt-text.png | Bin 0 -> 379 bytes .../toolbar/v2/1.5x/big/btn-table-alt-text.png | Bin 0 -> 401 bytes .../toolbar/v2/1.75x/big/btn-table-alt-text.png | Bin 0 -> 418 bytes .../img/toolbar/v2/1x/big/btn-table-alt-text.png | Bin 0 -> 327 bytes .../toolbar/v2/2.5x/big/btn-table-alt-text.svg | 4 ++++ .../img/toolbar/v2/2x/big/btn-table-alt-text.png | Bin 0 -> 502 bytes 12 files changed, 8 insertions(+) create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.25x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.5x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.75x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/v2/1x/big/btn-table-alt-text.png create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-table-alt-text.svg create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/v2/2x/big/btn-table-alt-text.png diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..d04cf84538786408d4139e0339ed822a5ac9419a GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!2%?k<+eNnQazq7jv*Dd-cCQrdBA~#@kAUmVo#0oT;RA@a@pA{ z)tk;(O0s%}Om|FKq3oP;VZy@OeAUm4tX*fmH=lfZO~UC}CpX-PoS${fNLZ5f`<8My xn+vyRp46?cov&N$kXAIC&A$21w3+h@7}-w0aIuWiTMKj-gQu&X%Q~loCIB`UOH2R& literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..b8bcd85aa5f6dbf6614eec8b1a00fdd456f07394 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf!2%@Py|(-YQoWuojv*Dd-rhLK+2A1HeDUS} zle&tkHS4*Z4!m$Q%$NG%;#jb1)vJCJmgR;5oV`a?B$(A0cylwHrFSXYG@tnDx^sWV zrb1_Fsg^8*ZH!eoUn+}+O>X5YxO6+D%+J#JHmeC_><_Inmf xok?AIsKaTm&XsB#lmFMMIo$s$hlI)(Fog0u{@lNTc?r;A44$rjF6*2UngFZ6OQ8S& literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..13e52c20045ca00aec1555291cb40baaf78d0fb1 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^NkDAK!2%?^w{5utr0P6f978H@y}fynlR=S(CGdBC z)%u3!l*Gf8kM@KZxO_a!%D}+4WTIw^P$OLR&`-dTMSS+-E#`~n8yre-Q#sRdKwa<} hOUgrTW`+lq3_GgN`uk1~?g6@l!PC{xWt~$(697eqKt})o literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..82694db5c5ba3a3d7f217322528052fe4aaff91c GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^7C>DbvN)J~u!eWh%+@tJKGAtH zTQr`_90{4nxu{E~W#`mC`I;3In=2m*+?USgmi*HraOdli-_5`0Us-hLj8pIy?#(i9 m*0Ov~(>@epXFuor4~DpmvTYO9^49|$!{F)a=d#Wzp$Py7>Pj2{ literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg b/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg new file mode 100644 index 0000000000..d48077a794 --- /dev/null +++ b/apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/big/btn-table-alt-text.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..48b1e9e09a8e4c6b8ffc48dd1b703824ad58f605 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!VDy@A5E+TQv3lvA+A6g0{(-+e$mx>Kt4-J zkY6yv{r~qj@Tn~T^7}kp978G?-(F#4V=?4ueK=>KdB*t*(p$dUUtaViG)`yH?q$mI zT+h^#qC8)!EtL!nnSV?m!{v%fwZ<{Iu89wm5C7m7;4A#JqHN#o!%pTxiO;1wH!!ve zTO8?-dGuNM;iLA`FAL`Gx^Zgpt0Z?D9{uP4KKMt6o?CHBa%&CeZgC;Lhwh3698N!8 eGSpdJ;;vyhzA8C-8oRFr$mO1{elF{r5}E+5-d%D4 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.25x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.25x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..86ec58258bcbcb2755a573a2f04a501e75e2cbd3 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3-qjPWHqDsi**-5LY1m{{8#s&!11<{=R?v zdyj(i9tFoOEG%BVdNp~+N7uYl=H})vUc8vJ?Y&FxX_wp+mX?;2wtsNVKLwO}{rWXf z*`ysGT=Gr<#eph8-0dJP(1aaQ!aYFKrAmVQf*BMbARh<{K;ZuU`#@`fU^CO}uRvAX zJY5_^DsH{KdYZ4vK&0iNV8EV+1~2Wsd;Vw7+K}OYC}L4tYhylpxBcX4EIDTPck|54 zP?V8xTcPk%DEO&x(@BG=UnkhG{JYj*sC}Y9fXDUvk1JAEul$YD-!5uP^E>5cdVYs( zQ}Z&(Xax-sr9xA_i8TV@$%+x1)TSPM(R}7?@4HT)boaYO*>&f6p5`pOe>OczevkF+ zQ!HO{mK>3?OL*BcE#C0_3K_>d$Jp2<(gs_5L-zg+zZ@6ip(NpYD8&Tm0|rl5KbLh* G2~7a=C#cl` literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.5x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1.5x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..89763791ae9c0574369f67588fa0c8f6045fbf84 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf!3-p&=Jq%NspJ5k5LY1m{{8#s&!11<{=R?v zdyj(i9tFoOEG*u`La)Ing+uyquoN~%N1>=5j%|GRu2jaed{TifT z#|M|ZQ%-uvX|tv-UbgJj$|#-FPkSv(i@dyBpY_UV=0TUt}p(d53lPUuyS`{i?7 zYOMWX(j2$vx%=`czEgO~ZQ^*T{})rF#x$L;ZidyWQD@m-_0Rh0V87*x{NJUGNZp=NGjXiO4OAS-*dUREW4^2hWaVQ_jDfA&F})h(6q|Q_(IRW}@SjcE{-h P&@T+0u6{1-oD!MoIAzDj{_XF9;;wn8fFeLMUcP)eY5Pal zypt2Rzi(xelm;3tTN30K%%HIU|9mip6Y~}B-@m_L!Tbda_OI2B1S-7i>Eakt!T9z{ zYblE%kLyKyo@1$R_MbI~DC!eg_BHo`Wa}c0e>+#@rR1_Mdd+_GMq`$=FK?2JiS3GI zD-~AGVmo5sGr{NZ1XYF8!V{(*S*mVgv+#FkOHo>-ljY_~KlU8S(RsRO4o9J*Zu6vq zX~soKTOTZ%wBeevX|%SwShs1=>!VF-LHwKnIuolr8h&-M$Sv*c-MgK2fxJk=-ADJ{ ziK}whGQMgT`u{+0)pog%@5h=~N&9(zVP3Afs`ju3bBfiI&W4Z^v*v7^)2yMlLpkO1 o$)ID-TkP~#>~ISd(cjJ1en#%4@0FD*K#wwby85}Sb4q9e0Qn!h9RL6T literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/1x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..e2754f233f4d86cbdb6e8366710ab25dc20ef303 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^7CVhI`B`{xaOa7%{%q#)hi&|CGQka z&@h;-4rq{YNswPKg8&5713?220FCyQJXrvgp6BV}7*cWT?G| zrT_O%oeUzMalxkF}PFMS4r6F*s+;U}SMTr}QD^nfL=8CT+pBADkby zKI$=$vDs=_@k%*&&e7^SSGv8 + + + diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2x/big/btn-table-alt-text.png b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2x/big/btn-table-alt-text.png new file mode 100644 index 0000000000000000000000000000000000000000..c4d77ffbee2bc4e2b45f96ab7b46c78aabbf6d47 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3-pYOnWMTRCRz)h$~3Y!ou9#974VZgIBL! z0clH1OQ7J(moI@NkPQ@k{`|R1-f5S-Q$XaFe`@mfkCS$Mn6&-FlpP;k@`2(fC++w+ zar=9Zg7Y2)$NRUxcg;WLns*AQ;Qjme5EG^Y1@lf#-1go%?^Ma`iRXdVYnBB01vAvY z|KAV7{S6HY@82sRxcvnJj~i(eo|kuCP~dvVDSIpHpyXviqw?{>v_9=EO_yp<>&KH6TF(g_d4=!o2$C3c>aS{ zX@R^K!ZMM^BKZ8+dRDq`*la9NeEX!Mc|=15&m8v)Q2|eE?JOi39^K=fR~h@^q(A>B z=UrRAhpm^s^!35LU&~qcCtl15;QRL`G^^>8??J1Zdvs^8Pq{xqjPt4Gk{h$kSvPj? zZDz7OQC%FcZ(c>-2KJ5e7AKBPD{RQHN|1T@@Ji$&>BEOF@^Y9TJ-=|uE~dY4b+W2! SP5gl&$l&Sf=d#Wzp$Pyny6vF= literal 0 HcmV?d00001 From 1c219231c9b00efc54f0368669af39ba8ff49b6d Mon Sep 17 00:00:00 2001 From: nikita_bartoshuk Date: Thu, 9 Oct 2025 14:13:32 +0300 Subject: [PATCH 5/9] added alt text icon --- apps/spreadsheeteditor/main/app/view/TableDesignTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/TableDesignTab.js b/apps/spreadsheeteditor/main/app/view/TableDesignTab.js index 9701f393a4..8d0d4bfb0c 100644 --- a/apps/spreadsheeteditor/main/app/view/TableDesignTab.js +++ b/apps/spreadsheeteditor/main/app/view/TableDesignTab.js @@ -320,7 +320,7 @@ define([ this.btnAltText = new Common.UI.Button({ cls : 'btn-toolbar x-huge icon-top', - iconCls : 'toolbar__icon btn-big-pivot-sum', + iconCls : 'toolbar__icon btn-table-alt-text', caption : this.txtAltText, lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.wsLock, _set.cantModifyFilter], style : 'width: 100%;', From 16885f4fcb8fdbe43407756c026d996f188974e1 Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Thu, 9 Oct 2025 14:17:49 +0300 Subject: [PATCH 6/9] Refactoring --- apps/pdfeditor/main/app/controller/RedactTab.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/pdfeditor/main/app/controller/RedactTab.js b/apps/pdfeditor/main/app/controller/RedactTab.js index f50345bc2b..9bf61db54f 100644 --- a/apps/pdfeditor/main/app/controller/RedactTab.js +++ b/apps/pdfeditor/main/app/controller/RedactTab.js @@ -58,7 +58,7 @@ define([ onLaunch: function () { this._state = {}; - this.redactionsWarningVisible = null; + this.redactionsWarning = null; this.isFileMenuTab = null; Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this)); @@ -194,9 +194,9 @@ define([ const isMarked = this.api.HasRedact(); if ( isMarked && - (!this.redactionsWarningVisible || !this.redactionsWarningVisible.isVisible()) + (!this.redactionsWarning || !this.redactionsWarning.isVisible()) ) { - this.redactionsWarningVisible = Common.UI.warning({ + this.redactionsWarning = Common.UI.warning({ width: 500, msg: this.textUnappliedRedactions, buttons: [{ @@ -216,7 +216,7 @@ define([ this.api.RemoveAllRedact(); this.api.SetRedactTool(false); this.view.btnMarkForRedact.toggle(false); - } else if (btn == 'cancel') { + } else { if (this.isFileMenuTab) { this.view.fireEvent('menu:hide', [this]); } @@ -233,7 +233,7 @@ define([ this.api.SetRedactTool(false); } } - this.isFileMenuTab = tab === 'file' ? true : false; + this.isFileMenuTab = tab === 'file'; }, onRedactionStateToggle: function(isRedaction) { From 8758432eb051c74165758c1375461291d8c0332d Mon Sep 17 00:00:00 2001 From: Dmitry-Ilyushechkin Date: Thu, 9 Oct 2025 14:20:30 +0300 Subject: [PATCH 7/9] fix bug 77464 --- apps/documenteditor/main/locale/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index e8d4f7a7ac..40e70b9538 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2570,6 +2570,7 @@ "DE.Views.DocumentHolder.txtUnderbar": "Bar under text", "DE.Views.DocumentHolder.txtUngroup": "Ungroup", "DE.Views.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data. To protect you computer, click only those hyperlinks from trusted sources. This location may be unsafe:

{0}

Are you sure you want to continue?", + "DE.Views.DocumentHolder.txtPercentage": "Percentage", "DE.Views.DocumentHolder.unicodeText": "Unicode", "DE.Views.DocumentHolder.updateStyleText": "Update %1 style", "DE.Views.DocumentHolder.vertAlignText": "Vertical alignment", From 5c9005319a3c2c3cb9181afcba8b237a054c9024 Mon Sep 17 00:00:00 2001 From: Alexey Koshelev Date: Thu, 9 Oct 2025 14:43:04 +0300 Subject: [PATCH 8/9] [common] Hide shortcuts settings --- .../main/app/view/FileMenuPanels.js | 28 +++++++++---------- apps/documenteditor/main/app_dev.js | 4 +-- apps/documenteditor/main/app_pack.js | 4 +-- .../pdfeditor/main/app/view/FileMenuPanels.js | 28 +++++++++---------- apps/pdfeditor/main/app_dev.js | 4 +-- apps/pdfeditor/main/app_pack.js | 4 +-- .../main/app/view/FileMenuPanels.js | 28 +++++++++---------- apps/presentationeditor/main/app_dev.js | 4 +-- apps/presentationeditor/main/app_pack.js | 4 +-- .../main/app/view/FileMenuPanels.js | 28 +++++++++---------- apps/spreadsheeteditor/main/app_dev.js | 4 +-- apps/spreadsheeteditor/main/app_pack.js | 4 +-- .../main/app/view/FileMenuPanels.js | 12 ++++---- apps/visioeditor/main/app_dev.js | 4 +-- apps/visioeditor/main/app_pack.js | 4 +-- 15 files changed, 82 insertions(+), 82 deletions(-) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 9b3ef94f30..02493072f4 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -445,10 +445,10 @@ define([], function () { '', '
', '', - '', - '', - '
', - '', + // '', + // '', + // '', + // '', '', '', '', @@ -779,10 +779,10 @@ define([], function () { dataHintOffset: 'big' }); - this.btnKeyboardMacros = new Common.UI.Button({ - el: $markup.findById('#fms-btn-keyboard-shortcuts') - }); - this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); + // this.btnKeyboardMacros = new Common.UI.Button({ + // el: $markup.findById('#fms-btn-keyboard-shortcuts') + // }); + // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); this.cmbFontSizeType = new Common.UI.ComboBox({ el : $markup.find('#fms-cmb-font-size-type'), @@ -1193,12 +1193,12 @@ define([], function () { this.dlgAutoCorrect.show(); }, - onClickKeyboardShortcut: function() { - const win = new Common.Views.ShortcutsDialog({ - api: this.api - }); - win.show(); - }, + // onClickKeyboardShortcut: function() { + // const win = new Common.Views.ShortcutsDialog({ + // api: this.api + // }); + // win.show(); + // }, customizeQuickAccess: function () { if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return; diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index 9d988f581c..dc0a4631e2 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -232,8 +232,8 @@ require([ 'common/main/lib/view/DocumentPropertyDialog', 'common/main/lib/view/MacrosDialog', 'common/main/lib/view/MacrosAiDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'common/main/lib/component/MonacoEditor', 'documenteditor/main/app/controller/DocumentHolderExt', diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js index 5f3002901b..4b718522c3 100644 --- a/apps/documenteditor/main/app_pack.js +++ b/apps/documenteditor/main/app_pack.js @@ -33,8 +33,8 @@ require([ 'common/main/lib/view/DocumentPropertyDialog', 'common/main/lib/view/MacrosDialog', 'common/main/lib/view/MacrosAiDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'common/main/lib/component/MonacoEditor', 'documenteditor/main/app/controller/DocumentHolderExt', diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js index f3c50aa878..ddf7c0bdfe 100644 --- a/apps/pdfeditor/main/app/view/FileMenuPanels.js +++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js @@ -388,10 +388,10 @@ define([], function () { '', '', '', - '', - '', - '', - '', + // '', + // '', + // '', + // '', '', '', '', @@ -609,10 +609,10 @@ define([], function () { }); this.cmbFontRender.on('selected', _.bind(this.onFontRenderSelected, this)); - this.btnKeyboardMacros = new Common.UI.Button({ - el: $markup.findById('#fms-btn-keyboard-shortcuts') - }); - this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); + // this.btnKeyboardMacros = new Common.UI.Button({ + // el: $markup.findById('#fms-btn-keyboard-shortcuts') + // }); + // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); this.cmbUnit = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-unit'), @@ -932,12 +932,12 @@ define([], function () { this._fontRender = combo.getValue(); }, - onClickKeyboardShortcut: function() { - const win = new Common.Views.ShortcutsDialog({ - api: this.api - }); - win.show(); - }, + // onClickKeyboardShortcut: function() { + // const win = new Common.Views.ShortcutsDialog({ + // api: this.api + // }); + // win.show(); + // }, customizeQuickAccess: function () { if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return; diff --git a/apps/pdfeditor/main/app_dev.js b/apps/pdfeditor/main/app_dev.js index 4959b2d1bd..dcd9058723 100644 --- a/apps/pdfeditor/main/app_dev.js +++ b/apps/pdfeditor/main/app_dev.js @@ -215,8 +215,8 @@ require([ 'common/main/lib/view/CustomizeQuickAccessDialog', 'common/main/lib/view/PasswordDialog', 'common/main/lib/component/TextareaField', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'pdfeditor/main/app/controller/DocumentHolderExt', 'pdfeditor/main/app/view/FileMenuPanels', diff --git a/apps/pdfeditor/main/app_pack.js b/apps/pdfeditor/main/app_pack.js index 2e54fd6c7a..c88f2a1769 100644 --- a/apps/pdfeditor/main/app_pack.js +++ b/apps/pdfeditor/main/app_pack.js @@ -25,8 +25,8 @@ require([ 'common/main/lib/view/CustomizeQuickAccessDialog', 'common/main/lib/view/PasswordDialog', 'common/main/lib/component/TextareaField', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'pdfeditor/main/app/controller/DocumentHolderExt', 'pdfeditor/main/app/view/FileMenuPanels', diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 1a9bb5a8b9..d427c5f67c 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -364,10 +364,10 @@ define([], function () { '', '
', '', - '', - '', - '', - '', + // '', + // '', + // '', + // '', '', '', '', @@ -597,10 +597,10 @@ define([], function () { }); this.lblMacrosDesc = $markup.findById('#fms-lbl-macros'); - this.btnKeyboardMacros = new Common.UI.Button({ - el: $markup.findById('#fms-btn-keyboard-shortcuts') - }); - this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); + // this.btnKeyboardMacros = new Common.UI.Button({ + // el: $markup.findById('#fms-btn-keyboard-shortcuts') + // }); + // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); this.chPaste = new Common.UI.CheckBox({ el: $markup.findById('#fms-chb-paste-settings'), @@ -900,12 +900,12 @@ define([], function () { this.dlgAutoCorrect.show(); }, - onClickKeyboardShortcut: function() { - const win = new Common.Views.ShortcutsDialog({ - api: this.api - }); - win.show(); - }, + // onClickKeyboardShortcut: function() { + // const win = new Common.Views.ShortcutsDialog({ + // api: this.api + // }); + // win.show(); + // }, customizeQuickAccess: function () { if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return; diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index fc36775999..e4a8a8ba66 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/apps/presentationeditor/main/app_dev.js @@ -230,8 +230,8 @@ require([ 'common/main/lib/view/DocumentPropertyDialog', 'common/main/lib/view/MacrosDialog', 'common/main/lib/view/MacrosAiDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'common/main/lib/component/MonacoEditor', 'common/main/lib/component/TextareaField', diff --git a/apps/presentationeditor/main/app_pack.js b/apps/presentationeditor/main/app_pack.js index 359c888196..5e4e30a1d8 100644 --- a/apps/presentationeditor/main/app_pack.js +++ b/apps/presentationeditor/main/app_pack.js @@ -30,8 +30,8 @@ require([ 'common/main/lib/view/DocumentPropertyDialog', 'common/main/lib/view/MacrosDialog', 'common/main/lib/view/MacrosAiDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'common/main/lib/component/MonacoEditor', 'common/main/lib/component/TextareaField', diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index caee5003e6..9d23519ff3 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -374,10 +374,10 @@ define([], function () { '
', '', '', - '', - '', - '
', - '', + // '', + // '', + // '', + // '', '', '', '', @@ -800,10 +800,10 @@ define([], function () { dataHintOffset: 'big' }); - this.btnKeyboardMacros = new Common.UI.Button({ - el: $markup.findById('#fms-btn-keyboard-shortcuts') - }); - this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); + // this.btnKeyboardMacros = new Common.UI.Button({ + // el: $markup.findById('#fms-btn-keyboard-shortcuts') + // }); + // this.btnKeyboardMacros.on('click', _.bind(this.onClickKeyboardShortcut, this)); this.chPaste = new Common.UI.CheckBox({ el: $markup.findById('#fms-chb-paste-settings'), @@ -1408,12 +1408,12 @@ define([], function () { this.dlgAutoCorrect.show(); }, - onClickKeyboardShortcut: function() { - const win = new Common.Views.ShortcutsDialog({ - api: this.api - }); - win.show(); - }, + // onClickKeyboardShortcut: function() { + // const win = new Common.Views.ShortcutsDialog({ + // api: this.api + // }); + // win.show(); + // }, SetDisabled: function(disabled) { if ( disabled ) { diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index c10b128f69..dfecf28cdb 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -229,8 +229,8 @@ require([ 'common/main/lib/view/DocumentPropertyDialog', 'common/main/lib/view/MacrosDialog', 'common/main/lib/view/MacrosAiDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'common/main/lib/component/MonacoEditor', 'spreadsheeteditor/main/app/controller/DocumentHolderExt', diff --git a/apps/spreadsheeteditor/main/app_pack.js b/apps/spreadsheeteditor/main/app_pack.js index 2c8a7046e7..241d2ec645 100644 --- a/apps/spreadsheeteditor/main/app_pack.js +++ b/apps/spreadsheeteditor/main/app_pack.js @@ -29,8 +29,8 @@ require([ 'common/main/lib/view/DocumentPropertyDialog', 'common/main/lib/view/MacrosDialog', 'common/main/lib/view/MacrosAiDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'common/main/lib/component/MonacoEditor', 'spreadsheeteditor/main/app/controller/DocumentHolderExt', diff --git a/apps/visioeditor/main/app/view/FileMenuPanels.js b/apps/visioeditor/main/app/view/FileMenuPanels.js index 551a27a5a2..6ffb25aa02 100644 --- a/apps/visioeditor/main/app/view/FileMenuPanels.js +++ b/apps/visioeditor/main/app/view/FileMenuPanels.js @@ -621,12 +621,12 @@ define([], function () { this._fontRender = combo.getValue(); }, - onClickKeyboardShortcut: function() { - const win = new Common.Views.ShortcutsDialog({ - api: this.api - }); - win.show(); - }, + // onClickKeyboardShortcut: function() { + // const win = new Common.Views.ShortcutsDialog({ + // api: this.api + // }); + // win.show(); + // }, customizeQuickAccess: function () { if (this.dlgQuickAccess && this.dlgQuickAccess.isVisible()) return; diff --git a/apps/visioeditor/main/app_dev.js b/apps/visioeditor/main/app_dev.js index 309658c6fc..103dd09d3a 100644 --- a/apps/visioeditor/main/app_dev.js +++ b/apps/visioeditor/main/app_dev.js @@ -173,8 +173,8 @@ require([ 'common/main/lib/view/PluginPanel', 'common/main/lib/view/DocumentHolderExt', 'common/main/lib/view/CustomizeQuickAccessDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'visioeditor/main/app/view/FileMenuPanels', 'visioeditor/main/app/view/DocumentHolderExt' diff --git a/apps/visioeditor/main/app_pack.js b/apps/visioeditor/main/app_pack.js index 3e2323d4bb..e4af978b5c 100644 --- a/apps/visioeditor/main/app_pack.js +++ b/apps/visioeditor/main/app_pack.js @@ -12,8 +12,8 @@ require([ 'common/main/lib/view/TextInputDialog', 'common/main/lib/view/DocumentHolderExt', 'common/main/lib/view/CustomizeQuickAccessDialog', - 'common/main/lib/view/ShortcutsDialog', - 'common/main/lib/view/ShortcutsEditDialog', + // 'common/main/lib/view/ShortcutsDialog', + // 'common/main/lib/view/ShortcutsEditDialog', 'visioeditor/main/app/view/FileMenuPanels', 'visioeditor/main/app/view/DocumentHolderExt' From ffd75eb7a7e737956c20918b7e836f70a275b6e6 Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Thu, 9 Oct 2025 15:10:05 +0300 Subject: [PATCH 9/9] Fix Bug 77467 --- apps/documenteditor/main/app/controller/DocProtection.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/documenteditor/main/app/controller/DocProtection.js b/apps/documenteditor/main/app/controller/DocProtection.js index e1484a4aed..e200661461 100644 --- a/apps/documenteditor/main/app/controller/DocProtection.js +++ b/apps/documenteditor/main/app/controller/DocProtection.js @@ -285,6 +285,8 @@ define([ }, applyRestrictions: function(type) { + if (this.appConfig.isPDFForm && this.api.asc_isFinal()) return; + if (type === Asc.c_oAscEDocProtect.ReadOnly) { this.api.asc_setRestriction(Asc.c_oAscRestrictionType.View); } else if (type === Asc.c_oAscEDocProtect.Comments) {