diff --git a/tools/config.json b/tools/config.json index a092ad5..9924494 100644 --- a/tools/config.json +++ b/tools/config.json @@ -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" ] } diff --git a/tools/create_package.py b/tools/create_package.py index cc7cef2..8a0e59a 100644 --- a/tools/create_package.py +++ b/tools/create_package.py @@ -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 diff --git a/tools/update_includes.py b/tools/update_includes.py index 82d712e..f123a7f 100644 --- a/tools/update_includes.py +++ b/tools/update_includes.py @@ -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 ('', '', libFiles, None) replacer.ReplaceTokenFileLinks ('', '', importerFiles, None) replacer.ReplaceTokenFileLinks ('', '', websiteFiles, None) diff --git a/website/embed.html b/website/embed.html index a417955..210a2c8 100644 --- a/website/embed.html +++ b/website/embed.html @@ -77,6 +77,7 @@ + @@ -95,7 +96,6 @@ - diff --git a/website/index.html b/website/index.html index 3c9c879..7f9822d 100644 --- a/website/index.html +++ b/website/index.html @@ -77,6 +77,7 @@ + @@ -95,7 +96,6 @@ -