pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move macros to postload. Build deploy version.

Browse Source
This commit is contained in:
Julia Radzhabova
2024-10-25 16:38:59 +03:00
parent 375b3ad3a9
commit 03afde2a8c
12 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/common/main/lib/view/MacrosDialog.js
View File

@ -40,9 +40,7 @@
if (Common === undefined)
var Common = {};
define([
'common/main/lib/component/Window'
], function () {
define([], function () {
'use strict';
Common.Views.MacrosDialog = Common.UI.Window.extend(_.extend({
template:
@ -132,7 +130,9 @@ define([
this.loadMask.setTitle(this.textLoading);
this.loadMask.show();
require(['../vendor/ace/ace'], function(ace) {
me.createCodeEditor();
require(['../vendor/ace/ext-language_tools'], function() {
me.createCodeEditor();
});
});
},
@ -326,9 +326,9 @@ define([
if (!window.isIE) {
me._state.aceLoadedModules.langTools = true;
me.onAceLoadModule();
ace.config.loadModule('ace/ext/language_tools', function () {
me._state.aceLoadedModules.langTools = true;
me.onAceLoadModule();
me.codeEditor.setOptions({
enableBasicAutocompletion: false,
enableLiveAutocompletion: true
@ -393,7 +393,7 @@ define([
if(macrosList.length > 0) {
macrosList.forEach(function (macros) {
macros.autostart = macros.autostart ?? false;
macros.autostart = !!macros.autostart;
});
this.listMacros.store.reset(macrosList);
var selectItem = this.listMacros.store.at(data.current);

3
apps/documenteditor/main/app/controller/ViewTab.js
View File

@ -39,8 +39,7 @@
define([
'core',
'documenteditor/main/app/view/ViewTab',
'common/main/lib/view/MacrosDialog',
'documenteditor/main/app/view/ViewTab'
], function () {
'use strict';

1
apps/documenteditor/main/app_dev.js
View File

@ -223,6 +223,7 @@ require([
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/util/define',
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'documenteditor/main/app/view/FileMenuPanels',
'documenteditor/main/app/view/DocumentHolderExt',

1
apps/documenteditor/main/app_pack.js
View File

@ -28,6 +28,7 @@ require([
'common/main/lib/view/TextInputDialog',
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'documenteditor/main/app/view/FileMenuPanels',
'documenteditor/main/app/view/DocumentHolderExt',

3
apps/presentationeditor/main/app/controller/ViewTab.js
View File

@ -40,8 +40,7 @@
define([
'core',
'presentationeditor/main/app/view/ViewTab',
'presentationeditor/main/app/view/GridSettings',
'common/main/lib/view/MacrosDialog'
'presentationeditor/main/app/view/GridSettings'
], function () {
'use strict';

1
apps/presentationeditor/main/app_dev.js
View File

@ -220,6 +220,7 @@ require([
'common/main/lib/view/SignDialog',
'common/main/lib/view/ListSettingsDialog',
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'presentationeditor/main/app/view/FileMenuPanels',
'presentationeditor/main/app/view/DocumentHolderExt',

1
apps/presentationeditor/main/app_pack.js
View File

@ -26,6 +26,7 @@ require([
'common/main/lib/view/SignDialog',
'common/main/lib/view/ListSettingsDialog',
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'presentationeditor/main/app/view/FileMenuPanels',
'presentationeditor/main/app/view/DocumentHolderExt',

3
apps/spreadsheeteditor/main/app/controller/ViewTab.js
View File

@ -39,8 +39,7 @@
define([
'core',
'spreadsheeteditor/main/app/view/ViewTab',
'common/main/lib/view/MacrosDialog'
'spreadsheeteditor/main/app/view/ViewTab'
], function () {
'use strict';

1
apps/spreadsheeteditor/main/app_dev.js
View File

@ -219,6 +219,7 @@ require([
'common/main/lib/view/SignDialog',
'common/main/lib/view/SignSettingsDialog',
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'spreadsheeteditor/main/app/view/FileMenuPanels',
'spreadsheeteditor/main/app/view/DocumentHolderExt',

1
apps/spreadsheeteditor/main/app_pack.js
View File

@ -25,6 +25,7 @@ require([
'common/main/lib/view/SignDialog',
'common/main/lib/view/SignSettingsDialog',
'common/main/lib/view/DocumentPropertyDialog',
'common/main/lib/view/MacrosDialog',
'spreadsheeteditor/main/app/view/FileMenuPanels',
'spreadsheeteditor/main/app/view/DocumentHolderExt',

2
build/Gruntfile.js
View File

@ -336,6 +336,7 @@ module.exports = function(grunt) {
doRegisterTask('fetch');
doRegisterTask('es6-promise');
doRegisterTask('common-embed');
doRegisterTask('ace');
doRegisterTask('requirejs', function(defaultConfig, packageFile) {
return {
terser: {
@ -819,6 +820,7 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-bootstrap', ['bootstrap-init', 'clean', 'copy']);
grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'terser']);
grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']);
grunt.registerTask('deploy-ace', ['ace-init', 'clean', 'copy']);
grunt.registerTask('deploy-common-embed', ['common-embed-init', 'clean', 'copy']);
grunt.registerTask('deploy-app-main', ['prebuild-icons-sprite', 'main-app-init', 'clean:prebuild', 'imagemin', 'less',

16
build/common.json
View File

@ -253,6 +253,19 @@
}
}
},
"ace": {
"clean": [
"../deploy/web-apps/vendor/ace"
],
"copy": {
"script": {
"expand": true,
"cwd": "../vendor/ace",
"src": "**",
"dest": "../deploy/web-apps/vendor/ace"
}
}
},
"tasks": {
"deploy": [
"increment-build",
@ -268,7 +281,8 @@
"deploy-iscroll",
"deploy-fetch",
"deploy-es6-promise",
"deploy-common-embed"
"deploy-common-embed",
"deploy-ace"
]
}
}