diff --git a/source/import/importer.js b/source/import/importer.js index fa788f3..d0d9eec 100644 --- a/source/import/importer.js +++ b/source/import/importer.js @@ -162,7 +162,8 @@ OV.Importer = class let mainFile = importableFiles[0]; this.ImportLoadedMainFile (mainFile, settings, callbacks); } else { - callbacks.onSelectMainFile (importableFiles, (mainFileIndex) => { + let fileNames = importableFiles.map (importableFile => importableFile.file.name); + callbacks.onSelectMainFile (fileNames, (mainFileIndex) => { if (mainFileIndex === null) { callbacks.onImportError (new OV.ImportError (OV.ImportErrorCode.NoImportableFile, null)); return; diff --git a/source/threejs/threemodelloader.js b/source/threejs/threemodelloader.js index 3a82f5b..45f41bc 100644 --- a/source/threejs/threemodelloader.js +++ b/source/threejs/threemodelloader.js @@ -36,11 +36,11 @@ OV.ThreeModelLoader = class onFilesLoaded : () => { this.callbacks.onImportStart (); }, - onSelectMainFile : (files, selectFile) => { + onSelectMainFile : (fileNames, selectFile) => { if (!this.callbacks.onSelectMainFile) { selectFile (0); } else { - this.callbacks.onSelectMainFile (files, selectFile); + this.callbacks.onSelectMainFile (fileNames, selectFile); } }, onImportSuccess : (importResult) => { diff --git a/website/o3dv/js/loader.js b/website/o3dv/js/loader.js index 109670f..87cb0ef 100644 --- a/website/o3dv/js/loader.js +++ b/website/o3dv/js/loader.js @@ -23,7 +23,7 @@ OV.InitModelLoader = function (modelLoader, callbacks) } } - function ShowFileSelectorDialog (files, onSelect) + function ShowFileSelectorDialog (fileNames, onSelect) { let dialog = new OV.ButtonDialog (); let contentDiv = dialog.Init ('Select Model', [ @@ -45,11 +45,11 @@ OV.InitModelLoader = function (modelLoader, callbacks) let fileListSection = OV.AddDiv (contentDiv, 'ov_dialog_section'); let fileList = OV.AddDiv (fileListSection, 'ov_dialog_import_file_list ov_thin_scrollbar'); - for (let i = 0; i < files.length; i++) { - let file = files[i]; + for (let i = 0; i < fileNames.length; i++) { + let fileName = fileNames[i]; let fileLink = OV.AddDiv (fileList, 'ov_dialog_file_link'); OV.AddSvgIconElement (fileLink, 'meshes', 'ov_file_link_img'); - OV.AddDiv (fileLink, 'ov_dialog_file_link_text', file.file.name); + OV.AddDiv (fileLink, 'ov_dialog_file_link_text', fileName); fileLink.addEventListener ('click', () => { dialog.SetCloseHandler (null); dialog.Hide (); @@ -79,9 +79,9 @@ OV.InitModelLoader = function (modelLoader, callbacks) progressDialog.Init ('Loading Model'); progressDialog.Show (); }, - onSelectMainFile : (files, selectFile) => { + onSelectMainFile : (fileNames, selectFile) => { progressDialog.Hide (); - modalDialog = ShowFileSelectorDialog (files, (index) => { + modalDialog = ShowFileSelectorDialog (fileNames, (index) => { progressDialog.Show (); selectFile (index); });