Merge branch 'release/v8.2.0' into feature/language-list

ONLYOFFICE · Sep 18, 2024 · 4482ddf · 4482ddf
2 parents d06391f + 61fdb33
commit 4482ddf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/apps/common/main/lib/view/TextInputDialog.js b/apps/common/main/lib/view/TextInputDialog.js
@@ -82,13 +82,15 @@ define([], function () { 'use strict';
                 el          : $('#id-dlg-label-custom-input'),
                 allowBlank  : me.inputConfig.allowBlank,
                 blankError  : me.inputConfig.blankError,
+                maxLength   : me.inputConfig.maxLength,
                 style       : 'width: 100%;',
                 validateOnBlur: false,
                 validation  : me.inputConfig.validation
             }) : new Common.UI.InputFieldFixed({
                 el          : $('#id-dlg-label-custom-input'),
                 allowBlank  : me.inputConfig.allowBlank,
                 blankError  : me.inputConfig.blankError,
+                maxLength   : me.inputFixedConfig.fixedValue && me.inputConfig.maxLength ? me.inputConfig.maxLength - me.inputFixedConfig.fixedValue.length : me.inputConfig.maxLength,
                 style       : 'width: 100%;',
                 validateOnBlur: false,
                 validation  : me.inputConfig.validation,

diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -455,6 +455,9 @@ define([
                 label: me.textSelectPath,
                 value: defFileName || '',
                 inputFixedConfig: {fixedValue: ext, fixedWidth: 40},
+                inputConfig: {
+                    maxLength: me.mode.wopi.FileNameMaxLength
+                },
                 handler: function(result, value) {
                     if (result == 'ok') {
                         if (typeof ext === 'string')

diff --git a/apps/pdfeditor/main/app/controller/LeftMenu.js b/apps/pdfeditor/main/app/controller/LeftMenu.js
@@ -369,6 +369,9 @@ define([
                 label: me.textSelectPath,
                 value: defFileName || '',
                 inputFixedConfig: {fixedValue: ext, fixedWidth: 40},
+                inputConfig: {
+                    maxLength: me.mode.wopi.FileNameMaxLength
+                },
                 handler: function(result, value) {
                     if (result == 'ok') {
                         if (typeof ext === 'string')

diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -312,6 +312,9 @@ define([
                 label: me.textSelectPath,
                 value: defFileName || '',
                 inputFixedConfig: {fixedValue: ext, fixedWidth: 40},
+                inputConfig: {
+                    maxLength: me.mode.wopi.FileNameMaxLength
+                },
                 handler: function(result, value) {
                     if (result == 'ok') {
                         if (typeof ext === 'string')

diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js
@@ -434,6 +434,9 @@ define([
                 label: me.textSelectPath,
                 value: defFileName || '',
                 inputFixedConfig: {fixedValue: ext, fixedWidth: 40},
+                inputConfig: {
+                    maxLength: me.mode.wopi.FileNameMaxLength
+                },
                 handler: function(result, value) {
                     if (result == 'ok') {
                         if (typeof ext === 'string')

diff --git a/apps/spreadsheeteditor/main/app/controller/Spellcheck.js b/apps/spreadsheeteditor/main/app/controller/Spellcheck.js
@@ -81,12 +81,12 @@ define([
             Common.NotificationCenter.trigger('script:loaded:spellcheck');
             if (this.api) {
                 this.api.asc_registerCallback('asc_onSpellCheckVariantsFound', _.bind(this.onSpellCheckVariantsFound, this));
+                this.api.asc_registerCallback('asc_onEditCell', _.bind(this.onApiEditCell, this));
             }
         },
 
         setApi: function(api) {
             this.api = api;
-            this.api.asc_registerCallback('asc_onEditCell', _.bind(this.onApiEditCell, this));
             return this;
         },