Merge branch 'release/v5.1.0' into feature/documentation-translations

apps/common/main/lib/component/DataView.js

@@ -575,11 +575,11 @@ define([
             if (div.length<=0) return;
             
             var div_top = div.offset().top;
-            if (div_top < inner_top || div_top+div.outerHeight() > inner_top + innerEl.height()) {
+            if (div_top < inner_top+div[0].offsetTop || div_top+div.outerHeight() > inner_top + innerEl.height()) {
                 if (this.scroller && this.allowScrollbar) {
-                    this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top, 0);
+                    this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top - div[0].offsetTop, 0);
                 } else {
-                    innerEl.scrollTop(innerEl.scrollTop() + div_top - inner_top);
+                    innerEl.scrollTop(innerEl.scrollTop() + div_top - inner_top - div[0].offsetTop);
                 }
             }
         },

apps/common/main/lib/component/Layout.js

@@ -370,7 +370,7 @@ define([
 
         setResizeValue: function (index, value) {
             if (index >= this.splitters.length)
-                return;
+                return false;
 
             var panel = null, next = null, oldValue = 0,
                 resize = this.splitters[index].resizer,
@@ -405,6 +405,7 @@ define([
             if (resize.value != value) {
                 this.doLayout();
             }
+            return (Math.abs(oldValue-value)>0.99);
         }
     });
 

apps/common/main/lib/template/CommentsPopover.template

@@ -5,7 +5,7 @@
     <div class="user-name"><%=scope.getUserName(username)%></div>
     <div class="user-date"><%=date%></div>
     <% if (!editTextInPopover || hint) { %>
-        <textarea readonly class="user-message user-select"><%=scope.pickLink(comment)%></textarea>
+        <textarea readonly class="user-message user-select" style="overflow: hidden;" maxlength="maxCommLength"><%=scope.pickLink(comment)%></textarea>
     <% } else { %>
         <div class="inner-edit-ct">
             <textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea>
@@ -27,7 +27,7 @@
                 <div class="user-name"><%=scope.getUserName(item.get("username"))%></div>
                 <div class="user-date"><%=item.get("date")%></div>
                 <% if (!item.get("editTextInPopover")) { %>
-                    <textarea readonly class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></textarea>
+                    <textarea readonly class="user-message user-select" maxlength="maxCommLength" style="overflow: hidden;"><%=scope.pickLink(item.get("reply"))%></textarea>
                     <% if (!hint) { %>
                         <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>

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

@@ -389,6 +389,7 @@ define([
             if (event && 0 == textBox.val().length) {
                 this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight));
                 this.textBoxAutoSizeLocked = undefined;
+                this.updateScrolls();
                 return;
             }
 
@@ -409,9 +410,8 @@ define([
 
             height = this.panelBox.height();
 
-            this.layout.setResizeValue(1,
+            if (this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight))))
-                Math.max(this.addMessageBoxHeight,
+                this.updateScrolls(); // update when resize position changed
-                    Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight)));
         },
 
         updateScrolls: function () {

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

@@ -148,7 +148,8 @@ define([
                         "Odd Page ": this.txtOddPage,
                         "Same as Previous": this.txtSameAsPrev,
                         "Current Document": this.txtCurrentDocument,
-                        "No table of contents entries found.": this.txtNoTableOfContents
+                        "No table of contents entries found.": this.txtNoTableOfContents,
+                        "Table of Contents": this.txtTableOfContents
                     };
                 styleNames.forEach(function(item){
                     translate[item] = me.translationTable[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
@@ -2243,6 +2244,7 @@ define([
             txtCurrentDocument: "Current Document",
             warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
             txtNoTableOfContents: "No table of contents entries found.",
+            txtTableOfContents: "Table of Contents",
             errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
         }
     })(), DE.Controllers.Main || {}))

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

@@ -568,6 +568,8 @@ define([
         },
 
         onApiPageSize: function(w, h) {
+            if (this._state.pgorient===undefined) return;
+
             var width = this._state.pgorient ? w : h,
                 height = this._state.pgorient ? h : w;
             if (Math.abs(this._state.pgsize[0] - w) > 0.01 ||

apps/documenteditor/main/app/template/LeftMenu.template

@@ -15,7 +15,7 @@
         <div id="left-panel-comments" class="" style="display: none;" />
         <div id="left-panel-chat" class="" style="display: none;" />
         <!-- /** coauthoring end **/ -->
-        <div id="left-panel-plugins" class="" style="display: none; height: 100%;" />
         <div id="left-panel-navigation" class="" style="display: none; height: 100%;" />
+        <div id="left-panel-plugins" class="" style="display: none; height: 100%;" />
     </div>
 </div>

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

@@ -146,7 +146,6 @@ define([
         ChangeSettings: function(props) {
         },
 
-        strNavigate: 'Table of Contents',
         txtPromote: 'Promote',
         txtDemote: 'Demote',
         txtHeadingBefore: 'New heading before',

apps/documenteditor/main/locale/en.json

@@ -398,6 +398,7 @@
   "DE.Controllers.Main.txtMath": "Math",
   "DE.Controllers.Main.txtNeedSynchronize": "You have updates",
   "DE.Controllers.Main.txtNoTableOfContents": "No table of contents entries found.",
+  "DE.Controllers.Main.txtTableOfContents": "Table of Contents",
   "DE.Controllers.Main.txtOddPage": "Odd Page ",
   "DE.Controllers.Main.txtOnPage": "on page ",
   "DE.Controllers.Main.txtRectangles": "Rectangles",

apps/documenteditor/main/resources/less/statusbar.less

@@ -214,4 +214,4 @@
 
 .button-normal-icon(btn-ic-zoomtowidth, 55, @toolbar-icon-size);
 .button-normal-icon(btn-ic-zoomtopage,  56, @toolbar-icon-size);
-.button-normal-icon(btn-ic-changes,     68, @toolbar-icon-size);
+.button-normal-icon(btn-ic-changes,     30, @toolbar-icon-size);

build/common.json

@@ -15,7 +15,7 @@
                         "expand": true,
                         "cwd": "../../sdkjs/common/",
                         "src": [
-                            "Images/*.cur",
+                            "Images/*",
                             "Native/*.js"
                         ],
                         "dest": "../deploy/sdkjs/common/"