Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'release/v7.2.0' of https://github.com/ONLYOFFICE/web-apps into release/v7.2.0

Browse source
This commit is contained in:
Maxim Kadushkin 2022-06-15 00:13:31 +03:00
parent 224482cd47 02cff6f9d5
commit ddf0541ef2
30 changed files with 48 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/controller/HintManager.js
View file

@ -568,7 +568,7 @@ Common.UI.HintManager = new(function() {
if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' ||
curr.closest('.btn-slot').prop('id') === 'slot-btn-mode' || curr.prop('id') === 'btn-favorite' || curr.parent().prop('id') === 'tlb-box-users' ||
curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll') || curr.prop('id') === 'left-btn-about' ||
curr.prop('id') === 'left-btn-support') {
curr.prop('id') === 'left-btn-support' || curr.closest('.btn-slot').prop('id') === 'slot-btn-search') {
_resetToDefault();
return;
}

16
apps/common/main/lib/view/Plugins.js
View file

@ -60,11 +60,11 @@ define([
'</div>',
'</div>',
'<div id="current-plugin-box" class="layout-ct vbox hidden">',
'<div id="current-plugin-frame" class="">',
'</div>',
'<div id="current-plugin-header">',
'<label></label>',
'<div id="id-plugin-close" class="tool close"></div>',
'</div>',
'<div id="current-plugin-frame" class="">',
'<div id="id-plugin-close" class="close"></div>',
'</div>',
'</div>',
'<div id="plugins-mask" style="display: none;">'
@ -111,6 +111,13 @@ define([
this.currentPluginPanel = $('#current-plugin-box');
this.currentPluginFrame = $('#current-plugin-frame');
this.pluginClose = new Common.UI.Button({
parentEl: $('#id-plugin-close'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-close',
hint: this.textClosePanel
});
this.pluginMenu = new Common.UI.Menu({
menuAlign : 'tr-br',
items: []
@ -426,7 +433,8 @@ define([
textLoading: 'Loading',
textStart: 'Start',
textStop: 'Stop',
groupCaption: 'Plugins'
groupCaption: 'Plugins',
textClosePanel: 'Close plugin'
}, Common.Views.Plugins || {}));
});

29
apps/common/main/resources/less/plugins.less
View file

@ -80,17 +80,20 @@
#current-plugin-header {
position: absolute;
top: 0;
height: 45px;
left: 0;
width: 100%;
height: 38px;
padding: 10px 12px;
top: 0;
right: 0;
padding: 12px;
overflow: hidden;
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar;
label {
width: 100%;
margin-top: 2px;
padding-right: 20px;
font-size: 12px;
.font-weight-bold();
overflow: hidden;
text-overflow: ellipsis;
@ -98,20 +101,18 @@
}
}
.tool {
.close {
position: absolute;
top: 9px;
right: 7px;
margin: 0;
/*&:before, &:after {
width: 2px;
width: @scaled-two-px-value;
}*/
width: 20px;
height: 20px;
top: 12px;
right: 12px;
}
#current-plugin-frame {
width: 100%;
height: 100%;
padding-top: 38px;
padding-top: 45px;
}
}

6
apps/documenteditor/forms/app.js
View file

@ -47,8 +47,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
@ -102,9 +100,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jszip',
'jsziputils'
'sockjs'
]
},
gateway: {

4
apps/documenteditor/forms/app_dev.js
View file

@ -47,8 +47,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -115,8 +113,6 @@ require([
'analytics',
'gateway',
'locale',
'jszip',
'jsziputils',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {

6
apps/documenteditor/main/app.js
View file

@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api',
@ -109,9 +107,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jszip',
'jsziputils'
'sockjs'
]
},
gateway: {

2
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -175,7 +175,7 @@ define([
{caption: me.textTabHome, action: 'home', extcls: 'canedit', dataHintTitle: 'H'},
{caption: me.textTabInsert, action: 'ins', extcls: 'canedit', dataHintTitle: 'I'},
{caption: me.textTabLayout, action: 'layout', extcls: 'canedit', layoutname: 'toolbar-layout', dataHintTitle: 'L'},
{caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'R'}
{caption: me.textTabLinks, action: 'links', extcls: 'canedit', layoutname: 'toolbar-references', dataHintTitle: 'N'}
// undefined, undefined, undefined, undefined,
]
}

4
apps/documenteditor/main/app_dev.js
View file

@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -122,8 +120,6 @@ require([
'analytics',
'gateway',
'locale',
'jszip',
'jsziputils',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {

1
apps/documenteditor/main/locale/en.json
View file

@ -347,6 +347,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
"Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",

4
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -60,9 +60,7 @@ class MainController extends Component {
!window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js',
'../../../../sdkjs/word/sdk-all-min.js']);
let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js',
'../../../vendor/sockjs/sockjs.min.js',
'../../../vendor/jszip/jszip.min.js',
'../../../vendor/jszip-utils/jszip-utils.min.js'];
'../../../vendor/sockjs/sockjs.min.js'];
dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => {

6
apps/presentationeditor/main/app.js
View file

@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all-min',
api : 'api/documents/api',
@ -108,9 +106,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jszip',
'jsziputils'
'sockjs'
]
},
gateway: {

4
apps/presentationeditor/main/app_dev.js
View file

@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -121,8 +119,6 @@ require([
'analytics',
'gateway',
'locale',
'jszip',
'jsziputils',
'sockjs',
'xregexp',
'underscore'

1
apps/presentationeditor/main/locale/en.json
View file

@ -449,6 +449,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
"Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",

2
apps/spreadsheeteditor/embed/index.html
View file

@ -255,8 +255,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>

2
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -247,8 +247,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
require.config({

2
apps/spreadsheeteditor/embed/index_loader.html
View file

@ -329,8 +329,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/cell/scripts.js"></script>
<script>

2
apps/spreadsheeteditor/embed/index_loader.html.deploy
View file

@ -321,8 +321,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<!--sdk-->
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>

6
apps/spreadsheeteditor/main/app.js
View file

@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all-min',
api : 'api/documents/api',
@ -108,9 +106,7 @@ require.config({
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jszip',
'jsziputils'
'sockjs'
]
},
gateway: {

6
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1317,7 +1317,11 @@ define([
},
searchShow: function () {
if (this.toolbar.btnSearch && this.searchBar && !this.searchBar.isVisible()) {
if (this.toolbar.btnSearch) {
if (this.searchBar && this.searchBar.isVisible()) {
this.searchBar.focus();
return;
}
this.toolbar.btnSearch.toggle(true);
}
},

2
apps/spreadsheeteditor/main/app/template/StatusBar.template
View file

@ -7,7 +7,7 @@
<div id="status-addtabs-box" class="status-group">
<button id="status-btn-addtab" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="X"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
<div class="cnt-tabslist">
<button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="V"><i class="icon toolbar__icon btn-sheet-list">&nbsp;</i></button>
<button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="N"><i class="icon toolbar__icon btn-sheet-list">&nbsp;</i></button>
</div>
</div>
<div id="status-zoom-box" class="status-group">

4
apps/spreadsheeteditor/main/app_dev.js
View file

@ -54,8 +54,6 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
@ -121,8 +119,6 @@ require([
'analytics',
'gateway',
'locale',
'jszip',
'jsziputils',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -304,6 +304,7 @@
"Common.Views.Plugins.textLoading": "Loading",
"Common.Views.Plugins.textStart": "Start",
"Common.Views.Plugins.textStop": "Stop",
"Common.Views.Plugins.textClosePanel": "Close plugin",
"Common.Views.Protection.hintAddPwd": "Encrypt with password",
"Common.Views.Protection.hintPwd": "Change or delete password",
"Common.Views.Protection.hintSignature": "Add digital signature or signature line",

4
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -71,9 +71,7 @@ class MainController extends Component {
'../../../vendor/bootstrap/dist/js/bootstrap.min.js',
'../../../vendor/underscore/underscore-min.js',
'../../../vendor/xregexp/xregexp-all-min.js',
'../../../vendor/sockjs/sockjs.min.js',
'../../../vendor/jszip/jszip.min.js',
'../../../vendor/jszip-utils/jszip-utils.min.js'];
'../../../vendor/sockjs/sockjs.min.js'];
dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => {

4
build/Gruntfile.js
View file

@ -282,8 +282,6 @@ module.exports = function(grunt) {
doRegisterTask('iscroll');
doRegisterTask('fetch');
doRegisterTask('es6-promise');
doRegisterTask('jszip');
doRegisterTask('jsziputils');
doRegisterTask('common-embed');
doRegisterTask('requirejs', function(defaultConfig, packageFile) {
return {
@ -674,8 +672,6 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-iscroll', ['iscroll-init', 'clean', 'copy']);
grunt.registerTask('deploy-fetch', ['fetch-init', 'clean', 'copy']);
grunt.registerTask('deploy-bootstrap', ['bootstrap-init', 'clean', 'copy']);
grunt.registerTask('deploy-jszip', ['jszip-init', 'clean', 'copy']);
grunt.registerTask('deploy-jsziputils', ['jsziputils-init', 'clean', 'copy']);
grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'terser']);
grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']);
grunt.registerTask('deploy-common-embed', ['common-embed-init', 'clean', 'copy']);

6
build/appforms.json
View file

@ -33,8 +33,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"jszip": "empty:",
"jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -87,9 +85,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs",
"jszip",
"jszip-utils"
"sockjs"
]
},
"gateway": {

24
build/common.json
View file

@ -202,28 +202,6 @@
}
}
},
"jszip": {
"clean": [
"../deploy/web-apps/vendor/jszip"
],
"copy": {
"script": {
"src": "../vendor/jszip/jszip.min.js",
"dest": "../deploy/web-apps/vendor/jszip/jszip.min.js"
}
}
},
"jsziputils": {
"clean": [
"../deploy/web-apps/vendor/jszip-utils"
],
"copy": {
"script": {
"src": "../vendor/jszip-utils/jszip-utils.min.js",
"dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js"
}
}
},
"underscore": {
"clean": [
"../deploy/web-apps/vendor/underscore"
@ -303,8 +281,6 @@
"deploy-bootstrap",
"deploy-iscroll",
"deploy-fetch",
"deploy-jszip",
"deploy-jsziputils",
"deploy-es6-promise",
"deploy-common-embed"
]

6
build/documenteditor.json
View file

@ -31,8 +31,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"jszip": "empty:",
"jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -85,9 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs",
"jszip",
"jszip-utils"
"sockjs"
]
},
"gateway": {

6
build/presentationeditor.json
View file

@ -31,8 +31,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"jszip": "empty:",
"jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -85,9 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs",
"jszip",
"jszip-utils"
"sockjs"
]
},
"gateway": {

6
build/spreadsheeteditor.json
View file

@ -31,8 +31,6 @@
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"jszip": "empty:",
"jszip-utils": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -85,9 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs",
"jszip",
"jszip-utils"
"sockjs"
]
},
"gateway": {

3
test/spreadsheeteditor/main/index.html
View file

@ -116,9 +116,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
require.config({