Skip to content

Commit 5820aee

Browse files
committed
feat: Small tweaks for QUploader design
1 parent a013d01 commit 5820aee

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/components/ajax-bar/QAjaxBar.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ function inc (p, amount) {
3535
amount = Math.random() * 2
3636
}
3737
else if (p < 99) {
38-
amount = 0.5
38+
amount = 0.6
3939
}
4040
else {
4141
amount = 0
4242
}
4343
}
44-
return between(Math.floor(p + amount), 0, 100)
44+
return between(p + amount, 0, 100)
4545
}
4646

4747
function highjackAjax (start, stop) {
@@ -142,7 +142,7 @@ export default {
142142
}
143143
},
144144
methods: {
145-
start () {
145+
start (speed = 300) {
146146
this.calls++
147147
if (this.calls > 1) { return }
148148

@@ -156,7 +156,7 @@ export default {
156156
this.animate = false
157157
this.timer = setTimeout(() => {
158158
this.animate = true
159-
this.__work()
159+
this.__work(speed)
160160
}, 100)
161161
},
162162
increment (amount) {
@@ -185,12 +185,12 @@ export default {
185185
}
186186
},
187187

188-
__work () {
188+
__work (speed) {
189189
if (this.progress < 100) {
190190
this.timer = setTimeout(() => {
191191
this.increment()
192-
this.__work()
193-
}, 100)
192+
this.__work(speed)
193+
}, speed)
194194
}
195195
}
196196
},

src/components/uploader/QUploader.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<q-icon
4545
v-if="uploading"
4646
slot="after"
47-
class="q-if-end self-center"
47+
class="q-if-end self-center q-if-control"
4848
:name="$q.icon.uploader[`clear${isInverted ? 'Inverted' : ''}`]"
4949
@click.native="abort"
5050
/>
@@ -53,7 +53,7 @@
5353
v-if="!uploading"
5454
slot="after"
5555
:name="$q.icon.uploader.add"
56-
class="q-uploader-pick-button q-if-control relative-position overflow-hidden"
56+
class="q-uploader-pick-button self-center q-if-control relative-position overflow-hidden"
5757
@click.native="__pick"
5858
:disabled="addDisabled"
5959
>
@@ -71,7 +71,7 @@
7171
v-if="!hideUploadButton && !uploading"
7272
slot="after"
7373
:name="$q.icon.uploader.upload"
74-
class="q-if-control"
74+
class="q-if-control self-center"
7575
:disabled="queueLength === 0"
7676
@click.native="upload"
7777
/>
@@ -80,7 +80,7 @@
8080
v-if="hasExpandedContent"
8181
slot="after"
8282
:name="$q.icon.uploader.expand"
83-
class="q-if-control generic_transition"
83+
class="q-if-control generic_transition self-center"
8484
:class="{'rotate-180': expanded}"
8585
@click.native="expanded = !expanded"
8686
/>

0 commit comments

Comments
 (0)