Merge pull request #816 from ONLYOFFICE/fix/bugfix

Fix/bugfix

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

@@ -187,7 +187,7 @@ define([
                 '<div class="input-group combobox input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
                 '<div class="form-control" style="padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></div>',
                 '<div style="display: table-cell;"></div>',
-                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
+                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>',
                 '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">'].concat(itemsTemplate).concat([
                 '</ul>',
                 '</div>'

apps/common/main/resources/less/combobox.less

@@ -68,16 +68,19 @@
         }
     }
 
-    &.input-group-nr.open:not(.no-highlighted) {
+    &.input-group-nr.open {
         & > .form-control,
         & > .btn {
-            border-color: @border-control-focus-ie;
-            border-color: @border-control-focus;
-
             .caret {
                 transform: rotate(45deg);
             }
         }
+
+        &:not(.no-highlighted) > .form-control,
+        &:not(.no-highlighted) > .btn {
+            border-color: @border-control-focus-ie;
+            border-color: @border-control-focus;
+        }
     }
 
     &.input-group-nr:not(.no-highlighted) > .form-control {
@@ -87,6 +90,13 @@
             border-color: @border-control-focus;
         }
     }
+    &.input-group-nr.no-highlighted > .form-control {
+        &:focus,
+        &:focus ~ button.dropdown-toggle {
+            border-color: @border-regular-control-ie;
+            border-color: @border-regular-control;
+        }
+    }
 
     li {
         a {
@@ -173,4 +183,13 @@
             border-color: @border-control-focus;
         }
     }
+
+    &.input-group-nr {
+        & > .form-control,
+        & > .btn {
+            .caret {
+                transform: rotate(45deg);
+            }
+        }
+    }
 }

apps/documenteditor/main/app/controller/Main.js

@@ -141,7 +141,8 @@ define([
                     "Choose an item": this.txtChoose,
                     "Enter a date": this.txtEnterDate,
                     "Type equation here": this.txtTypeEquation,
-                    "Click to load image": this.txtClickToLoad
+                    "Click to load image": this.txtClickToLoad,
+                    "No table of figures entries found.": this.txtNoTableOfFigures
                 };
                 styleNames.forEach(function(item){
                     translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
@@ -2836,7 +2837,8 @@ define([
             textLongName: 'Enter a name that is less than 128 characters.',
             textGuest: 'Guest',
             errorSubmit: 'Submit failed.',
-            txtClickToLoad: 'Click to load image'
+            txtClickToLoad: 'Click to load image',
+            txtNoTableOfFigures: "No table of figures entries found."
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -195,7 +195,7 @@ define([
                 '<div class="input-group combobox input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
                 '<div class="form-control" style="padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></div>',
                 '<div style="display: table-cell;"></div>',
-                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
+                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>',
                     '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">'].concat(itemsTemplate).concat([
                     '</ul>',
                 '</div>'

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

@@ -247,7 +247,9 @@ define([
             this.numIndentsRight.on('change', this.onNumIndentsRightChange.bind(this));
             this.numSpecialBy.on('change', this.onFirstLineChange.bind(this));
             this.cmbSpecial.on('selected', _.bind(this.onSpecialSelect, this));
-
+            this.numIndentsLeft.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+            this.numIndentsRight.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
+            this.numSpecialBy.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
 
             this.linkAdvanced = $markup.findById('#paragraph-advanced-link');
             this.linkAdvanced.toggleClass('disabled', this._locked);
@@ -363,6 +365,13 @@ define([
             var props = new Asc.asc_CParagraphProperty();
             props.put_Ind(new Asc.asc_CParagraphInd());
             props.get_Ind().put_FirstLine(specialBy);
+            if (specialBy<0 || this._state.FirstLine<0) {
+                var left = this._state.LeftIndent;
+                if (left !== undefined && left !== null) {
+                    props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left);
+                }
+            }
+
             if (this.api)
                 this.api.paraApply(props);
             this.fireEvent('editcomplete', this);
@@ -377,22 +386,27 @@ define([
             var props = new Asc.asc_CParagraphProperty();
             props.put_Ind(new Asc.asc_CParagraphInd());
             props.get_Ind().put_FirstLine(specialBy);
+            if (specialBy<0 || this._state.FirstLine<0) {
+                var left = this._state.LeftIndent;
+                if (left !== undefined && left !== null) {
+                    props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left);
+                }
+            }
+
             if (this.api)
                 this.api.paraApply(props);
-            this.fireEvent('editcomplete', this);
         },
 
         onNumIndentsLeftChange: function(field, newValue, oldValue, eOpts){
-            var left = field.getNumberValue();
+            var left = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
             if (this._state.FirstLine<0) {
                 left = left-this._state.FirstLine;
             }
             var props = new Asc.asc_CParagraphProperty();
             props.put_Ind(new Asc.asc_CParagraphInd());
-            props.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(left));
+            props.get_Ind().put_Left(left);
             if (this.api)
                 this.api.paraApply(props);
-            this.fireEvent('editcomplete', this);
         },
 
         onNumIndentsRightChange: function(field, newValue, oldValue, eOpts){
@@ -401,7 +415,6 @@ define([
             props.get_Ind().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
             if (this.api)
                 this.api.paraApply(props);
-            this.fireEvent('editcomplete', this);
         },
 
         ChangeSettings: function(prop) {
@@ -539,7 +552,10 @@ define([
                 for (var i=0; i<this.spinners.length; i++) {
                     var spinner = this.spinners[i];
                     spinner.setDefaultUnit(Common.Utils.Metric.getCurrentMetricName());
+                    if (spinner.el.id == 'paragraphadv-spin-position' || spinner.el.id == 'paragraph-spin-spacing-before' || spinner.el.id == 'paragraph-spin-spacing-after')
                         spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.01);
+                    else
+                        spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
                 }
             }
             this._arrLineRule[2].defaultUnit =  this._arrLineRule[0].defaultUnit = Common.Utils.Metric.getCurrentMetricName();

apps/documenteditor/main/locale/en.json

@@ -613,6 +613,7 @@
   "DE.Controllers.Main.txtMissOperator": "Missing Operator",
   "DE.Controllers.Main.txtNeedSynchronize": "You have updates",
   "DE.Controllers.Main.txtNoTableOfContents": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.",
+  "DE.Controllers.Main.txtNoTableOfFigures": "No table of figures entries found.",
   "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
   "DE.Controllers.Main.txtNotInTable": "Is Not In Table",
   "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",

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

@@ -193,7 +193,7 @@ define([
                     '<div class="list-item" style="width: 100%;" id="chart-type-dlg-item-<%= seriesIndex %>">',
                         '<div style="width:8px;height:12px;display: inline-block;vertical-align: middle;" id="chart-type-dlg-series-preview-<%= seriesIndex %>"></div>',
                         '<div style="width:95px;padding-left: 5px;display: inline-block;vertical-align: middle;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;"><%= value %></div>',
-                        '<div style="width: 110px;padding-left: 5px;display: inline-block;vertical-align: middle;color: initial;"><div id="chart-type-dlg-cmb-series-<%= seriesIndex %>" class="input-group-nr" style=""></div></div>',
+                        '<div style="width: 110px;padding-left: 5px;display: inline-block;vertical-align: middle;"><div id="chart-type-dlg-cmb-series-<%= seriesIndex %>" class="input-group-nr" style=""></div></div>',
                         '<div style="padding-left: 55px;display: inline-block;vertical-align: middle;"><div id="chart-type-dlg-chk-series-<%= seriesIndex %>" style=""></div></div>',
                     '</div>'
                 ].join(''))
@@ -388,7 +388,7 @@ define([
                 template: _.template([
                     '<span class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle no-highlighted" tabindex="0" data-toggle="dropdown">',
                         '<input type="text" class="form-control" spellcheck="false">',
-                        '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-target="' + id + '"><span class="caret img-commonctrl"></span></button>',
+                        '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-target="' + id + '"><span class="caret"></span></button>',
                     '</span>'
                 ].join(''))
             });

apps/spreadsheeteditor/mobile/app/controller/Main.js

@@ -1147,6 +1147,10 @@ define([
                         config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : this.errorDataValidate;
                         break;
 
+                    case Asc.c_oAscError.ID.LockedCellPivot:
+                        config.msg = this.errorLockedCellPivot;
+                        break;
+
                     default:
                         config.msg = this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -1188,6 +1192,7 @@ define([
                     config.buttons = [{ text: 'OK' }, { text: this.textCancel, onClick: config.callback }];
                 } else {
                     config.buttons = [{ text: 'OK', onClick: config.callback }];
+                    $('#ce-cell-content').blur();
                 }
                 uiApp.modal({
                     title   : config.title,
@@ -1789,7 +1794,8 @@ define([
             warnLicenseLimitedRenewed: 'License needs to be renewed.<br>You have a limited access to document editing functionality.<br>Please contact your administrator to get full access',
             warnLicenseLimitedNoAccess: 'License expired.<br>You have no access to document editing functionality.<br>Please contact your administrator.',
             textGuest: 'Guest',
-            errorDataValidate: 'The value you entered is not valid.<br>A user has restricted values that can be entered into this cell.'
+            errorDataValidate: 'The value you entered is not valid.<br>A user has restricted values that can be entered into this cell.',
+            errorLockedCellPivot: 'You cannot change data inside a pivot table.'
         }
     })(), SSE.Controllers.Main || {}))
 });

apps/spreadsheeteditor/mobile/locale/en.json

@@ -214,6 +214,8 @@
   "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download it until the connection is restored and page is reloaded.",
   "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.<br>Wrong number of brackets is used.",
   "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.<br>Please correct the error.",
+  "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.<br>A user has restricted values that can be entered into this cell.",
+  "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.",
   "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
   "SSE.Controllers.Main.loadFontsTextText": "Loading data...",
   "SSE.Controllers.Main.loadFontsTitleText": "Loading Data",