fix: extend loader parser

setaman · Jan 5, 2021 · 365a12c · 365a12c
1 parent 4590d73
commit 365a12c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -44,25 +44,8 @@
           determinate
           :thickness="10"
           :empty-thickness="10"
-          line-mode="center"
-          :color="{
-            colors: [
-              { color: 'red', offset: '0' },
-              { color: 'green', offset: '50' },
-              { color: 'blue', offset: '100' },
-            ],
-          }"
-          :loader="{
-            color: {
-              colors: [
-                { color: 'yellow', offset: '0' },
-                { color: 'black', offset: '100' },
-              ],
-            },
-            thickness: 10,
-            lineMode: 'out-over',
-            opacity: 1,
-          }"
+          line-mode="out"
+          :loader="{ lineMode: 'in ', opacity: 0.5 }"
         >
         </ve-progress>
       </div>

diff --git a/src/components/optionsParser.js b/src/components/optionsParser.js
@@ -62,10 +62,12 @@ export const linePositionParser = (linePosition) => {
   };
 };
 
-export const loaderParser = (loader, circleLineMode, circleThickness, circleSize) => ({
+export const loaderParser = (loader, options) => ({
   ...loader,
-  lineMode: lineModeParser(loader.lineMode || circleLineMode, false),
-  thickness: calcThickness(loader.thickness || circleThickness, circleSize),
+  color: loader.color || options.color,
+  line: loader.line || options.line,
+  lineMode: lineModeParser(loader.lineMode || options.lineMode, false),
+  thickness: calcThickness(loader.thickness || options.thickness, options.size),
 });
 
 export const parseOptions = (options) => ({
@@ -80,5 +82,5 @@ export const parseOptions = (options) => ({
   linePosition: linePositionParser(options.linePosition),
   emptyLinePosition: linePositionParser(options.emptyLinePosition),
   animation: animationParser(options.animation),
-  loader: loaderParser(options.loader, options.lineMode, options.thickness, options.size),
+  loader: loaderParser(options.loader, options),
 });