From d7c5ce1b7704600ae1aac9f436efd35f025ec781 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Jul 2020 20:58:25 +0300 Subject: [PATCH 01/75] Fix tabbar on start (show scroll arrows on small windows) --- apps/common/main/lib/component/Mixtbar.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index 74b785c60..af13108ba 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -462,8 +462,10 @@ define([ }, setVisible: function (tab, visible) { - if ( tab && this.$tabs ) + if ( tab && this.$tabs ) { this.$tabs.find('> a[data-tab=' + tab + ']').parent().css('display', visible ? '' : 'none'); + this.onResize(); + } } }; }())); From 58952fcc9abb419163398a254ca84d5ba6f21213 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 30 Jul 2020 23:58:14 +0300 Subject: [PATCH 02/75] [deploy] fix bug 45991 --- build/Gruntfile.js | 15 +++++---------- build/documenteditor.json | 17 +++++++++-------- build/presentationeditor.json | 18 ++++++++++-------- build/spreadsheeteditor.json | 21 +++++++++------------ 4 files changed, 33 insertions(+), 38 deletions(-) diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 74ebe193c..9715241cd 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -352,19 +352,14 @@ module.exports = function(grunt) { help: { files: packageFile['main']['copy']['help'] }, - 'index-page': { - files: packageFile['main']['copy']['index-page'] + indexhtml: { + files: packageFile['main']['copy']['indexhtml'] } }, inline: { - 'index-page': { - src: packageFile.main.copy['index-page'][0].dest, - dest: packageFile.main.copy['index-page'][0].dest - }, - 'old-loader-page': { - src: packageFile.main.copy['index-page'][1].dest, - dest: packageFile.main.copy['index-page'][1].dest + dist: { + src: '<%= pkg.main.copy.indexhtml[0].dest %>/*.html' } }, @@ -594,7 +589,7 @@ module.exports = function(grunt) { grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']); grunt.registerTask('deploy-app-main', ['prebuild-icons-sprite', 'main-app-init', 'clean:prebuild', 'imagemin', 'less', - 'requirejs', 'concat', 'copy', 'svgmin', 'inline:index-page', 'inline:old-loader-page', 'json-minify', + 'requirejs', 'concat', 'copy', 'svgmin', 'inline', 'json-minify', 'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']); grunt.registerTask('deploy-app-mobile', ['mobile-app-init', 'clean:deploy', 'cssmin', 'copy:template-backup', diff --git a/build/documenteditor.json b/build/documenteditor.json index 13c6c8be6..afba6cb9a 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -1,7 +1,7 @@ { "name": "documenteditor", "version": "4.3.0", - "build": 1148, + "build": 1149, "homepage": "http://www.onlyoffice.com", "private": true, "main": { @@ -172,14 +172,15 @@ "dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/" } ], - "index-page": [ + "indexhtml": [ { - "src": "../apps/documenteditor/main/index.html.deploy", - "dest": "../deploy/web-apps/apps/documenteditor/main/index.html" - }, - { - "src": "../apps/documenteditor/main/index_loader.html.deploy", - "dest": "../deploy/web-apps/apps/documenteditor/main/index_loader.html" + "expand": true, + "cwd": "../apps/documenteditor/main", + "src": [ + "*.html.deploy" + ], + "ext": ".html", + "dest": "../deploy/web-apps/apps/documenteditor/main" } ] }, diff --git a/build/presentationeditor.json b/build/presentationeditor.json index 29bf6d14c..965e811f4 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -1,7 +1,7 @@ { "name": "presentationeditor", "version": "4.3.0", - "build": 782, + "build": 790, "homepage": "http://www.onlyoffice.com", "private": true, "main": { @@ -166,14 +166,16 @@ "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/" } ], - "index-page": [ + "indexhtml": [ { - "src": "../apps/presentationeditor/main/index.html.deploy", - "dest": "../deploy/web-apps/apps/presentationeditor/main/index.html" - }, - { - "src": "../apps/presentationeditor/main/index_loader.html.deploy", - "dest": "../deploy/web-apps/apps/presentationeditor/main/index_loader.html" + "expand": true, + "cwd": "../apps/presentationeditor/main", + "src": [ + "*.html.deploy", + "!*.reporter.html.deploy" + ], + "ext": ".html", + "dest": "../deploy/web-apps/apps/presentationeditor/main/" } ] }, diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 9001b3643..f76aacaa2 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -1,7 +1,7 @@ { "name": "spreadsheeteditor", "version": "4.3.0", - "build": 886, + "build": 903, "homepage": "http://www.onlyoffice.com", "private": true, "main": { @@ -180,18 +180,15 @@ "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/" } ], - "index-page": [ + "indexhtml": [ { - "src": "../apps/spreadsheeteditor/main/index.html.deploy", - "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index.html" - }, - { - "src": "../apps/spreadsheeteditor/main/index_loader.html.deploy", - "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index_loader.html" - }, - { - "src": "../apps/spreadsheeteditor/main/index_internal.html.deploy", - "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index_internal.html" + "expand": true, + "cwd": "../apps/spreadsheeteditor/main", + "src": [ + "*.html.deploy" + ], + "ext": ".html", + "dest": "../deploy/web-apps/apps/spreadsheeteditor/main" } ] }, From a5efba6cca769c3f0362776714617f7582ef5b3c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 31 Jul 2020 10:51:35 +0300 Subject: [PATCH 03/75] Fix Bug 46000 --- apps/common/main/lib/view/Header.js | 104 +++++++++--------- .../main/app/controller/Viewport.js | 4 +- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 5ce8af24e..46542cad2 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -78,30 +78,32 @@ define([ '