Skip to content

Commit 365a12c

Browse files
committed
fix: extend loader parser
1 parent 4590d73 commit 365a12c

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

src/App.vue

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,8 @@
4444
determinate
4545
:thickness="10"
4646
:empty-thickness="10"
47-
line-mode="center"
48-
:color="{
49-
colors: [
50-
{ color: 'red', offset: '0' },
51-
{ color: 'green', offset: '50' },
52-
{ color: 'blue', offset: '100' },
53-
],
54-
}"
55-
:loader="{
56-
color: {
57-
colors: [
58-
{ color: 'yellow', offset: '0' },
59-
{ color: 'black', offset: '100' },
60-
],
61-
},
62-
thickness: 10,
63-
lineMode: 'out-over',
64-
opacity: 1,
65-
}"
47+
line-mode="out"
48+
:loader="{ lineMode: 'in ', opacity: 0.5 }"
6649
>
6750
</ve-progress>
6851
</div>

src/components/optionsParser.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,12 @@ export const linePositionParser = (linePosition) => {
6262
};
6363
};
6464

65-
export const loaderParser = (loader, circleLineMode, circleThickness, circleSize) => ({
65+
export const loaderParser = (loader, options) => ({
6666
...loader,
67-
lineMode: lineModeParser(loader.lineMode || circleLineMode, false),
68-
thickness: calcThickness(loader.thickness || circleThickness, circleSize),
67+
color: loader.color || options.color,
68+
line: loader.line || options.line,
69+
lineMode: lineModeParser(loader.lineMode || options.lineMode, false),
70+
thickness: calcThickness(loader.thickness || options.thickness, options.size),
6971
});
7072

7173
export const parseOptions = (options) => ({
@@ -80,5 +82,5 @@ export const parseOptions = (options) => ({
8082
linePosition: linePositionParser(options.linePosition),
8183
emptyLinePosition: linePositionParser(options.emptyLinePosition),
8284
animation: animationParser(options.animation),
83-
loader: loaderParser(options.loader, options.lineMode, options.thickness, options.size),
85+
loader: loaderParser(options.loader, options),
8486
});

0 commit comments

Comments
 (0)