From 3c7e7171495e73287075b1e00399dc88b8111fff Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 7 Mar 2018 15:55:35 +0300 Subject: [PATCH 01/10] Fix Bug 37134 --- apps/common/main/lib/component/DataView.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index bb4706c077..64c0533c04 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/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); } } }, From f2268b99964d6fb70186460e322211300e511a31 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Mon, 12 Mar 2018 10:52:21 +0300 Subject: [PATCH 02/10] Add all files in sdkjs/common/Images to build directory --- build/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.json b/build/common.json index bbe9f8883d..b835d4ece1 100644 --- a/build/common.json +++ b/build/common.json @@ -15,7 +15,7 @@ "expand": true, "cwd": "../../sdkjs/common/", "src": [ - "Images/*.cur", + "Images/*", "Native/*.js" ], "dest": "../deploy/sdkjs/common/" From f3aa2b4b32301c26ec5cc997feebeb34fa5315ac Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 12 Mar 2018 11:59:35 +0300 Subject: [PATCH 03/10] [DE] Fix Bug 37162 --- apps/documenteditor/main/resources/less/statusbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 98b196f4a0..bfcb6842dd 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/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); From eace54100d7bc05401a459aea9695ac92d0b5568 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 12 Mar 2018 12:11:22 +0300 Subject: [PATCH 04/10] [DE] Fix Bug 37170 --- apps/documenteditor/main/app/controller/Toolbar.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 471cbcccde..6af47e7947 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/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 || From 898e0086d5b8b0bd1052e7ba4e0c4f7304c8408b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 12 Mar 2018 12:41:29 +0300 Subject: [PATCH 05/10] Fix Bug 37177 --- apps/common/main/lib/template/CommentsPopover.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index e967973337..20f185e2eb 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -5,7 +5,7 @@
<%=scope.getUserName(username)%>
<%=date%>
<% if (!editTextInPopover || hint) { %> - + <% } else { %>
@@ -27,7 +27,7 @@
<%=scope.getUserName(item.get("username"))%>
<%=item.get("date")%>
<% if (!item.get("editTextInPopover")) { %> - + <% if (!hint) { %>
<% if (item.get("editable")) { %> From bc30e303da9e58c988b9582ecd08069afaaf0bad Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 12 Mar 2018 14:50:41 +0300 Subject: [PATCH 06/10] [DE] Fix Bug 37163 --- apps/documenteditor/main/app/template/LeftMenu.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template index ad40fa7e82..01f72350d9 100644 --- a/apps/documenteditor/main/app/template/LeftMenu.template +++ b/apps/documenteditor/main/app/template/LeftMenu.template @@ -15,7 +15,7 @@