Merge pull request #1683 from ONLYOFFICE/fix/bugfix

Fix/bugfix

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

@@ -803,6 +803,12 @@ define([
 
         setEmptyText: function(emptyText) {
             this.emptyText = emptyText;
+
+            if (this.store.length < 1) {
+                var el = $(this.el).find('.inner').addBack().filter('.inner').find('.empty-text td');
+                if ( el.length>0 )
+                    el.text(this.emptyText);
+            }
         },
 
         alignPosition: function() {

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

@@ -443,7 +443,8 @@ define([
                         textReply: me.textReply,
                         textClose: me.textClose,
                         maxCommLength: Asc.c_oAscMaxCellOrCommentLength
-                    }))
+                    })),
+                    emptyText: me.txtEmpty
                 });
 
                 var addtooltip = function (dataview, view, record) {
@@ -860,6 +861,7 @@ define([
         textClosePanel: 'Close comments',
         textViewResolved: 'You have not permission for reopen comment',
         mniFilterGroups: 'Filter by Group',
-        textAll: 'All'
+        textAll: 'All',
+        txtEmpty: 'There are no comments in the document.'
     }, Common.Views.Comments || {}))
 });

apps/common/main/resources/less/comments.less

@@ -45,6 +45,22 @@
             margin-bottom: 5px;
             right: 4px !important;
         }
+
+        .dataview-ct.inner {
+            .empty-text {
+                text-align: center;
+                height: 100%;
+                width: 100%;
+                color: @text-tertiary-ie;
+                color: @text-tertiary;
+                tr {
+                    vertical-align: top;
+                    td {
+                        padding-top: 18px;
+                    }
+                }
+            }
+        }
     }
 
     .add-link-ct {

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

@@ -103,6 +103,8 @@ define([
         setMode: function(mode) {
             this.mode = mode;
             this.canUseViwerNavigation = this.mode.canUseViwerNavigation;
+            if (this.panelNavigation && this.panelNavigation.viewNavigationList)
+                this.panelNavigation.viewNavigationList.setEmptyText(this.mode.isEdit ? this.panelNavigation.txtEmpty : this.panelNavigation.txtEmptyViewer);
             return this;
         },
 

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

@@ -158,7 +158,8 @@ define([
         txtCollapse: 'Collapse all',
         txtExpandToLevel: 'Expand to level...',
         txtEmpty: 'There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.',
-        txtEmptyItem: 'Empty Heading'
+        txtEmptyItem: 'Empty Heading',
+        txtEmptyViewer: 'There are no headings in the document.'
 
     }, DE.Views.Navigation || {}));
 });

apps/documenteditor/main/locale/en.json

@@ -262,6 +262,7 @@
   "Common.Views.Comments.textResolved": "Resolved",
   "Common.Views.Comments.textSort": "Sort comments",
   "Common.Views.Comments.textViewResolved": "You have no permission to reopen the comment",
+  "Common.Views.Comments.txtEmpty": "There are no comments in the document.",
   "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again",
   "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.<br><br>To copy or paste to or from applications outside the editor tab use the following keyboard combinations:",
   "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions",
@@ -2124,6 +2125,7 @@
   "DE.Views.Navigation.txtDemote": "Demote",
   "DE.Views.Navigation.txtEmpty": "There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.",
   "DE.Views.Navigation.txtEmptyItem": "Empty Heading",
+  "DE.Views.Navigation.txtEmptyViewer": "There are no headings in the document.",
   "DE.Views.Navigation.txtExpand": "Expand all",
   "DE.Views.Navigation.txtExpandToLevel": "Expand to level",
   "DE.Views.Navigation.txtHeadingAfter": "New heading after",

apps/documenteditor/main/locale/ru.json

@@ -2117,6 +2117,7 @@
   "DE.Views.Navigation.txtCollapse": "Свернуть все",
   "DE.Views.Navigation.txtDemote": "Понизить уровень",
   "DE.Views.Navigation.txtEmpty": "В документе нет заголовков.<br>Примените стиль заголовка к тексту, чтобы он появился в оглавлении.",
+  "DE.Views.Navigation.txtEmptyViewer": "В документе нет заголовков.",
   "DE.Views.Navigation.txtEmptyItem": "Пустой заголовок",
   "DE.Views.Navigation.txtExpand": "Развернуть все",
   "DE.Views.Navigation.txtExpandToLevel": "Развернуть до уровня",

apps/presentationeditor/main/locale/en.json

@@ -349,6 +349,7 @@
   "Common.Views.Comments.textResolved": "Resolved",
   "Common.Views.Comments.textSort": "Sort comments",
   "Common.Views.Comments.textViewResolved": "You have no permission to reopen the comment",
+  "Common.Views.Comments.txtEmpty": "There are no comments in the document.",
   "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again",
   "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.<br><br>To copy or paste to or from applications outside the editor tab use the following keyboard combinations:",
   "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions",

apps/spreadsheeteditor/main/locale/en.json

@@ -202,6 +202,7 @@
   "Common.Views.Comments.textResolved": "Resolved",
   "Common.Views.Comments.textSort": "Sort comments",
   "Common.Views.Comments.textViewResolved": "You have no permission to reopen the comment",
+  "Common.Views.Comments.txtEmpty": "There are no comments in the sheet.",
   "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again",
   "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.<br><br>To copy or paste to or from applications outside the editor tab use the following keyboard combinations:",
   "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions",