Browse Source

make `getFileNameAndExtension` retrun `{name, extension}` instead of an array

Artur Paikin 7 years ago
parent
commit
5412187b88
2 changed files with 8 additions and 6 deletions
  1. 7 5
      src/core/Utils.js
  2. 1 1
      src/plugins/Dashboard/FileItem.js

+ 7 - 5
src/core/Utils.js

@@ -123,7 +123,7 @@ function getFileType (file) {
     'svg': 'image/svg+xml'
     'svg': 'image/svg+xml'
   }
   }
 
 
-  const fileExtension = file.name ? getFileNameAndExtension(file.name)[1] : null
+  const fileExtension = file.name ? getFileNameAndExtension(file.name).extension : null
 
 
   if (file.isRemote) {
   if (file.isRemote) {
     // some remote providers do not support file types
     // some remote providers do not support file types
@@ -178,17 +178,19 @@ function getFileTypeExtension (mimeType) {
 }
 }
 
 
 /**
 /**
-* Takes a full filename string and returns an array of [fileName, fileExt]
+* Takes a full filename string and returns an object {name, extension}
 *
 *
 * @param {string} fullFileName
 * @param {string} fullFileName
-* @return {array} [fileName, fileExt]
+* @return {object} {name, extension}
 */
 */
 function getFileNameAndExtension (fullFileName) {
 function getFileNameAndExtension (fullFileName) {
-  if (!fullFileName) return
   var re = /(?:\.([^.]+))?$/
   var re = /(?:\.([^.]+))?$/
   var fileExt = re.exec(fullFileName)[1]
   var fileExt = re.exec(fullFileName)[1]
   var fileName = fullFileName.replace('.' + fileExt, '')
   var fileName = fullFileName.replace('.' + fileExt, '')
-  return [fileName, fileExt]
+  return {
+    name: fileName,
+    extension: fileExt
+  }
 }
 }
 
 
 function supportsMediaRecorder () {
 function supportsMediaRecorder () {

+ 1 - 1
src/plugins/Dashboard/FileItem.js

@@ -21,7 +21,7 @@ module.exports = function fileItem (props) {
   const isPaused = file.isPaused || false
   const isPaused = file.isPaused || false
   const error = file.error || false
   const error = file.error || false
 
 
-  const fileName = getFileNameAndExtension(file.meta.name)[0]
+  const fileName = getFileNameAndExtension(file.meta.name).name
   const truncatedFileName = props.isWide ? truncateString(fileName, 15) : fileName
   const truncatedFileName = props.isWide ? truncateString(fileName, 15) : fileName
 
 
   const onPauseResumeCancelRetry = (ev) => {
   const onPauseResumeCancelRetry = (ev) => {