Separate js and css in config file.

This commit is contained in:
kovacsv 2021-07-25 11:32:32 +02:00
parent b825403634
commit 428881a8c4
5 changed files with 10 additions and 6 deletions

View File

@ -62,7 +62,7 @@
"source/viewer/viewer.js",
"source/viewer/domviewer.js"
],
"website_files" : [
"website_files_js" : [
"website/o3dv/featureset.js",
"website/o3dv/utils.js",
"website/o3dv/cookies.js",
@ -81,9 +81,11 @@
"website/o3dv/settingssidebarpanel.js",
"website/o3dv/sidebar.js",
"website/o3dv/hashhandler.js",
"website/o3dv/website.css",
"website/o3dv/loader.js",
"website/o3dv/website.js",
"website/o3dv/embed.js"
],
"website_files_css" : [
"website/o3dv/website.css"
]
}

View File

@ -163,7 +163,7 @@ def Main (argv):
return 1
PrintInfo ('Compress website sources.')
compressResult = CompressFiles (config['website_files'], os.path.join (websiteDir, 'o3dv', 'o3dv.website.min.js'))
compressResult = CompressFiles (config['website_files_js'], os.path.join (websiteDir, 'o3dv', 'o3dv.website.min.js'))
if not compressResult:
PrintError ('Compress website sources failed.')
return 1

View File

@ -28,7 +28,9 @@ def Main (argv):
replacer = Tools.TokenReplacer (htmlFilePath, True)
libFiles = Tools.CreateFileList (config['lib_files'], 'libs/', '../libs/')
importerFiles = Tools.CreateFileList (config['engine_files'], 'source/', '../source/')
websiteFiles = Tools.CreateFileList (config['website_files'], 'website/', '')
websiteCssFiles = Tools.CreateFileList (config['website_files_css'], 'website/', '')
websiteJsFiles = Tools.CreateFileList (config['website_files_js'], 'website/', '')
websiteFiles = websiteCssFiles + websiteJsFiles
replacer.ReplaceTokenFileLinks ('<!-- libs start -->', '<!-- libs end -->', libFiles, None)
replacer.ReplaceTokenFileLinks ('<!-- engine start -->', '<!-- engine end -->', importerFiles, None)
replacer.ReplaceTokenFileLinks ('<!-- website start -->', '<!-- website end -->', websiteFiles, None)

View File

@ -77,6 +77,7 @@
<!-- engine end -->
<!-- website start -->
<link rel="stylesheet" type="text/css" href="o3dv/website.css">
<script type="text/javascript" src="o3dv/featureset.js"></script>
<script type="text/javascript" src="o3dv/utils.js"></script>
<script type="text/javascript" src="o3dv/cookies.js"></script>
@ -95,7 +96,6 @@
<script type="text/javascript" src="o3dv/settingssidebarpanel.js"></script>
<script type="text/javascript" src="o3dv/sidebar.js"></script>
<script type="text/javascript" src="o3dv/hashhandler.js"></script>
<link rel="stylesheet" type="text/css" href="o3dv/website.css">
<script type="text/javascript" src="o3dv/loader.js"></script>
<script type="text/javascript" src="o3dv/website.js"></script>
<script type="text/javascript" src="o3dv/embed.js"></script>

View File

@ -77,6 +77,7 @@
<!-- engine end -->
<!-- website start -->
<link rel="stylesheet" type="text/css" href="o3dv/website.css">
<script type="text/javascript" src="o3dv/featureset.js"></script>
<script type="text/javascript" src="o3dv/utils.js"></script>
<script type="text/javascript" src="o3dv/cookies.js"></script>
@ -95,7 +96,6 @@
<script type="text/javascript" src="o3dv/settingssidebarpanel.js"></script>
<script type="text/javascript" src="o3dv/sidebar.js"></script>
<script type="text/javascript" src="o3dv/hashhandler.js"></script>
<link rel="stylesheet" type="text/css" href="o3dv/website.css">
<script type="text/javascript" src="o3dv/loader.js"></script>
<script type="text/javascript" src="o3dv/website.js"></script>
<script type="text/javascript" src="o3dv/embed.js"></script>