Merge pull request #567 from ONLYOFFICE/fix/bugfix

Fix/bugfix

apps/common/main/lib/view/EditNameDialog.js

@@ -78,7 +78,7 @@ define([
                 blankError  : me.options.error ? me.options.error : me.textLabelError,
                 style       : 'width: 100%;',
                 validateOnBlur: false,
-                validation  : function(value) {
+                validation  : me.options.validation || function(value) {
                     return value ? true : '';
                 }
             });

apps/documenteditor/main/app/view/NoteSettingsDialog.js

@@ -224,6 +224,10 @@ define([
                 allowDecimal: false,
                 maskExp: /[0-9]/
             });
+            this.spnStart.on('change', function(field, newValue, oldValue, eOpts){
+                if (field.getNumberValue()>1 && me.cmbNumbering.getValue()!==Asc.c_oAscFootnoteRestart.Continuous)
+                    me.cmbNumbering.setValue(Asc.c_oAscFootnoteRestart.Continuous);
+            });
 
             this._arrNumbering = [
                 { displayValue: this.textContinue,   value: Asc.c_oAscFootnoteRestart.Continuous },
@@ -238,6 +242,10 @@ define([
                 data: this._arrNumbering
             });
             this.cmbNumbering.setValue(Asc.c_oAscFootnoteRestart.Continuous);
+            this.cmbNumbering.on('selected', function(combo, record){
+                if (record.value == Asc.c_oAscFootnoteRestart.EachSect || record.value == Asc.c_oAscFootnoteRestart.EachPage)
+                    me.spnStart.setValue(1, true);
+            });
 
             this.txtCustom = new Common.UI.InputField({
                 el          : $('#note-settings-txt-custom'),

apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js

@@ -71,7 +71,7 @@ define([
                                 '<tr>',
                                     '<td class="padding-small">',
                                         '<label class="header">' + this.textViews + '</label>',
-                                        '<div id="view-manager-list" class="range-tableview" style="width:100%; height: 166px;"></div>',
+                                        '<div id="view-manager-list" class="range-tableview" style="width:440px; height: 166px;"></div>',
                                     '</td>',
                                 '</tr>',
                                 '<tr>',
@@ -270,6 +270,9 @@ define([
                     label: this.textRenameLabel,
                     error: this.textRenameError,
                     value: rec.get('name'),
+                    validation: function(value) {
+                        return value.length<=128 ? true : me.textLongName;
+                    },
                     handler: function(result, value) {
                         if (result == 'ok') {
                             rec.get('view').asc_setName(value);
@@ -340,7 +343,8 @@ define([
         tipIsLocked: 'This element is being edited by another user.',
         textRenameLabel: 'Rename view',
         textRenameError: 'View name must not be empty.',
-        warnDeleteView: "You are trying to delete the currently enabled view '%1'.<br>Close this view and delete it?"
+        warnDeleteView: "You are trying to delete the currently enabled view '%1'.<br>Close this view and delete it?",
+        textLongName: 'View name is limited to 128 characters.'
 
     }, SSE.Views.ViewManagerDlg || {}));
 });

apps/spreadsheeteditor/main/locale/en.json

@@ -2953,6 +2953,7 @@
   "SSE.Views.ViewManagerDlg.tipIsLocked": "This element is being edited by another user.",
   "SSE.Views.ViewManagerDlg.txtTitle": "Sheet View Manager",
   "SSE.Views.ViewManagerDlg.warnDeleteView": "You are trying to delete the currently enabled view '%1'.<br>Close this view and delete it?",
+  "SSE.Views.ViewManagerDlg.textLongName": "View name is limited to 128 characters.",
   "SSE.Views.ViewTab.capBtnFreeze": "Freeze Panes",
   "SSE.Views.ViewTab.capBtnSheetView": "Sheet View",
   "SSE.Views.ViewTab.textClose": "Close",

apps/spreadsheeteditor/main/locale/ru.json

@@ -2953,6 +2953,7 @@
   "SSE.Views.ViewManagerDlg.tipIsLocked": "Этот элемент редактируется другим пользователем.",
   "SSE.Views.ViewManagerDlg.txtTitle": "Диспетчер представлений листа",
   "SSE.Views.ViewManagerDlg.warnDeleteView": "Вы пытаетесь удалить активированное в данный момент представление '%1'.<br>Закрыть это представление и удалить его?",
+  "SSE.Views.ViewManagerDlg.textLongName": "Имя представления ограничено 128 символами.",
   "SSE.Views.ViewTab.capBtnFreeze": "Закрепить области",
   "SSE.Views.ViewTab.capBtnSheetView": "Представление листа",
   "SSE.Views.ViewTab.textClose": "Закрыть",