Refactor

dawnlabs · Feb 25, 2017 · 134a7e0 · 134a7e0
1 parent 7d69e52
commit 134a7e0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/components/Converter.jsx b/src/components/Converter.jsx
@@ -137,7 +137,7 @@ class Sanitizer extends Component {
           <div className="row">
             <div className="switch">
               {
-                operations.map(op => (
+                Object.keys(fileTypes).map(op => (
                   <button
                     className={`switch__btn merge ${this.state.operation === op ? 'switch__btn-active' : ''}`}
                     onClick={() => this.setState({

diff --git a/src/helpers/constants.js b/src/helpers/constants.js
@@ -23,7 +23,6 @@ module.exports = {
     [CONVERT]: ['png', 'jpg', 'bmp', 'tiff'],
     [MERGE]: ['pdf', 'gif']
   },
-  operations: [MERGE, CONVERT],
   blue,
   lightBlue,
   offwhite,

diff --git a/src/helpers/util.js b/src/helpers/util.js
@@ -15,11 +15,11 @@ const filterImages = files => Object.keys(files)
 
 const createOutputFileName = (files, outputType) => `ALCHEMY-${concatFiles(files)}.${outputType || 'pdf'}`
 
-const centerEllipsis = str => (
-  (str.length > 15) ?
-    `${str.substr(0, 7)}...${str.substr(str.length - 7, str.length)}` :
+function centerEllipsis(str, length = 7) {
+  return (str.length > (length * 2) + 1) ?
+    `${str.substr(0, length)}...${str.substr(str.length - length, str.length)}` :
     str
-)
+}
 
 // TODO curry?
 const displayOutputFileName = (files, outputType) =>