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

[all] fix loading sdk scripts

Browse source
This commit is contained in:
Maxim Kadushkin 2021-05-03 20:02:21 +03:00
parent 7bb9cc90ab
commit fdda540c47
5 changed files with 54 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/common/mobile/lib/view/About.jsx
View file

@ -121,6 +121,7 @@ const PageAbout = props => {
const About = inject("storeAppOptions")(observer(PageAbout));
About.appVersion = () => (__PRODUCT_VERSION__);
About.compareVersions = () => /d$/.test(__PRODUCT_VERSION__);
About.developVersion = () => /(?:d|debug)$/.test(__PRODUCT_VERSION__);
export default About;

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

@ -48,15 +48,13 @@ class MainController extends Component {
}
initSdk() {
const script = document.createElement("script");
script.src = "../../../../sdkjs/develop/sdkjs/word/scripts.js";
script.async = true;
script.onload = () => {
const on_script_load = () => {
!window.sdk_scripts && (window.sdk_scripts = ['../../../../../../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'];
dep_scripts.push(...sdk_scripts);
'../../../vendor/sockjs/sockjs.min.js',
'../../../vendor/jszip/jszip.min.js',
'../../../vendor/jszip-utils/jszip-utils.min.js'];
dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => {
return new Promise((resolve, reject) => {
@ -311,11 +309,19 @@ class MainController extends Component {
});
};
script.onerror = () => {
console.log('error');
};
if ( About.developVersion() ) {
const script = document.createElement("script");
script.src = "../../../../sdkjs/develop/sdkjs/word/scripts.js";
script.async = true;
script.onload = on_script_load;
script.onerror = () => {
console.log('error on load scripts');
};
document.body.appendChild(script);
document.body.appendChild(script);
} else {
on_script_load();
}
}
applyMode (appOptions) {

29
apps/presentationeditor/mobile/src/controller/Main.jsx
View file

@ -46,14 +46,11 @@ class MainController extends Component {
}
initSdk () {
const script = document.createElement("script");
script.src = "../../../../sdkjs/develop/sdkjs/slide/scripts.js";
script.async = true;
script.onload = () => {
let dep_scripts = [
'../../../vendor/xregexp/xregexp-all-min.js',
'../../../vendor/sockjs/sockjs.min.js'];
dep_scripts.push(...sdk_scripts);
const on_script_load = () => {
!window.sdk_scripts && (window.sdk_scripts = ['../../../../../../sdkjs/slide/sdk-all-min.js']);
let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js',
'../../../vendor/sockjs/sockjs.min.js'];
dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => {
return new Promise((resolve, reject) => {
@ -213,11 +210,19 @@ class MainController extends Component {
});
};
script.onerror = () => {
console.log('error');
};
if ( About.developVersion() ) {
const script = document.createElement("script");
script.src = "../../../../sdkjs/develop/sdkjs/slide/scripts.js";
script.async = true;
script.onload = on_script_load;
script.onerror = () => {
console.log('error on load script');
};
document.body.appendChild(script);
document.body.appendChild(script);
} else {
on_script_load();
}
}
applyMode(appOptions) {

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

@ -48,10 +48,8 @@ class MainController extends Component {
}
initSdk() {
const script = document.createElement("script");
script.src = "../../../../sdkjs/develop/sdkjs/cell/scripts.js";
script.async = true;
script.onload = () => {
const on_load_scripts = () => {
!window.sdk_scripts && (window.sdk_scripts = ['../../../../../../sdkjs/cell/sdk-all-min.js']);
let dep_scripts = [
'../../../vendor/jquery/jquery.min.js',
'../../../vendor/jquery.browser/dist/jquery.browser.min.js',
@ -61,7 +59,7 @@ class MainController extends Component {
'../../../vendor/sockjs/sockjs.min.js',
'../../../vendor/jszip/jszip.min.js',
'../../../vendor/jszip-utils/jszip-utils.min.js'];
dep_scripts.push(...sdk_scripts);
dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => {
return new Promise((resolve, reject) => {
@ -272,13 +270,21 @@ class MainController extends Component {
}, error => {
console.log('promise failed ' + error);
});
};
}
script.onerror = () => {
console.log('error');
};
if ( About.developVersion() ) {
const script = document.createElement("script");
script.src = "../../../../sdkjs/develop/sdkjs/cell/scripts.js";
script.async = true;
script.onload = on_load_scripts;
script.onerror = () => {
console.log('error load scripts');
};
document.body.appendChild(script);
document.body.appendChild(script);
} else {
on_script_load();
}
}
bindEvents() {

3
vendor/framework7-react/build/webpack.config.js vendored
View file

@ -189,7 +189,8 @@ module.exports = {
// new CleanWebpackPlugin(),
new HtmlWebpackPlugin({
filename: `../../../apps/${editor}/mobile/index.html`,
template: `../../apps/${editor}/mobile/src/index_dev.html`,
template: env == 'development' ? `../../apps/${editor}/mobile/src/index_dev.html` :
`../../apps/${editor}/mobile/src/index.html.deploy`,
inject: true,
minify: env === 'production' ? {
collapseWhitespace: true,