[all] fix bug 58156

This commit is contained in:
Maxim Kadushkin 2022-07-21 00:22:51 +03:00
parent 24b2153d40
commit 7c584932a0
11 changed files with 21 additions and 39 deletions

View file

@ -318,9 +318,9 @@
}; };
</script> </script>
<inline src="resources/img/header/icons.svg" /> <inline src="../../common/main/resources/img/header/icons.svg" />
<inline src="resources/img/toolbar/shapetypes.svg" /> <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="resources/img/toolbar/charttypes.svg" /> <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script> <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>

View file

@ -317,9 +317,9 @@
}; };
</script> </script>
<inline src="resources/img/header/icons.svg" /> <inline src="../../common/main/resources/img/header/icons.svg" />
<inline src="resources/img/toolbar/shapetypes.svg" /> <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="resources/img/toolbar/charttypes.svg" /> <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<div id="viewport"></div> <div id="viewport"></div>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>

View file

@ -362,9 +362,9 @@
}; };
</script> </script>
<inline src="resources/img/header/icons.svg" /> <inline src="../../common/main/resources/img/header/icons.svg" />
<inline src="resources/img/toolbar/shapetypes.svg" /> <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="resources/img/toolbar/charttypes.svg" /> <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script> <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>

View file

@ -318,9 +318,9 @@
}; };
</script> </script>
<inline src="resources/img/header/icons.svg" /> <inline src="../../common/main/resources/img/header/icons.svg" />
<inline src="resources/img/toolbar/shapetypes.svg" /> <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="resources/img/toolbar/charttypes.svg" /> <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<div id="viewport"></div> <div id="viewport"></div>

View file

@ -376,9 +376,9 @@
}; };
</script> </script>
<inline src="resources/img/header/icons.svg" /> <inline src="../../common/main/resources/img/header/icons.svg" />
<inline src="resources/img/toolbar/shapetypes.svg" /> <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="resources/img/toolbar/charttypes.svg" /> <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<inline src="resources/img/cf-icons.svg" /> <inline src="resources/img/cf-icons.svg" />
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script> <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>

View file

@ -231,8 +231,8 @@
}; };
</script> </script>
<!--<inline src="resources/img/header/buttons.svg" />--> <!--<inline src="../../common/main/resources/img/header/buttons.svg" />-->
<inline src="resources/img/toolbar/charttypes.svg" /> <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
</body> </body>

View file

@ -317,9 +317,9 @@
}; };
</script> </script>
<inline src="resources/img/header/icons.svg" /> <inline src="../../common/main/resources/img/header/icons.svg" />
<inline src="resources/img/toolbar/shapetypes.svg" /> <inline src="../../common/main/resources/img/toolbar/shapetypes.svg" />
<inline src="resources/img/toolbar/charttypes.svg" /> <inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<inline src="resources/img/cf-icons.svg" /> <inline src="resources/img/cf-icons.svg" />
<div id="viewport"></div> <div id="viewport"></div>

View file

@ -320,7 +320,7 @@ module.exports = function(grunt) {
src: packageFile.main.clean.prebuild src: packageFile.main.clean.prebuild
}, },
postbuild: { postbuild: {
src: [...packageFile.main.svgicons.clean, ...packageFile.main.clean.postbuild] src: [...packageFile.main.clean.postbuild]
} }
}, },

View file

@ -186,12 +186,6 @@
}, },
"svgicons": { "svgicons": {
"common": [ "common": [
{
"expand": true,
"cwd": "../apps/common/main/resources/img",
"src": "**/*.svg",
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/img"
},
{ {
"expand": true, "expand": true,
"cwd": "../apps/documenteditor/main/resources/img", "cwd": "../apps/documenteditor/main/resources/img",

View file

@ -181,12 +181,6 @@
}, },
"svgicons": { "svgicons": {
"common": [ "common": [
{
"expand": true,
"cwd": "../apps/common/main/resources/img",
"src": "**/*.svg",
"dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img"
},
{ {
"expand": true, "expand": true,
"cwd": "../apps/presentationeditor/main/resources/img", "cwd": "../apps/presentationeditor/main/resources/img",

View file

@ -194,12 +194,6 @@
}, },
"svgicons": { "svgicons": {
"common": [ "common": [
{
"expand": true,
"cwd": "../apps/common/main/resources/img",
"src": "**/*.svg",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img"
},
{ {
"expand": true, "expand": true,
"cwd": "../apps/spreadsheeteditor/main/resources/img", "cwd": "../apps/spreadsheeteditor/main/resources/img",