diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-07-17 18:45:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:45:21 +0900 |
| commit | f65fbf9d556314f3ee512e150bed4de19580903b (patch) | |
| tree | ccf18b24ec6b6e99fac7152e6412071060dc11ca /src/client | |
| parent | 4.21.0 (diff) | |
| parent | Update analog-clock.vue (diff) | |
| download | sharkey-f65fbf9d556314f3ee512e150bed4de19580903b.tar.gz sharkey-f65fbf9d556314f3ee512e150bed4de19580903b.tar.bz2 sharkey-f65fbf9d556314f3ee512e150bed4de19580903b.zip | |
Merge pull request #1916 from acid-chicken/acid-chicken-patch-1
Proposal: Smooth Clock
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/analog-clock.vue | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/client/app/common/views/components/analog-clock.vue b/src/client/app/common/views/components/analog-clock.vue index 53fb2a8dad..d3a365b156 100644 --- a/src/client/app/common/views/components/analog-clock.vue +++ b/src/client/app/common/views/components/analog-clock.vue @@ -45,7 +45,7 @@ export default Vue.extend({ data() { return { now: new Date(), - clock: null, + enabled: true, graduationsPadding: 0.5, handsPadding: 1, @@ -74,6 +74,9 @@ export default Vue.extend({ return themeColor; }, + ms(): number { + return this.now.getMilliseconds(); + } s(): number { return this.now.getSeconds(); }, @@ -85,13 +88,13 @@ export default Vue.extend({ }, hAngle(): number { - return Math.PI * (this.h % 12 + this.m / 60) / 6; + return Math.PI * (this.h % 12 + (this.m + (this.s + this.ms / 1000) / 60) / 60) / 6; }, mAngle(): number { - return Math.PI * (this.m + this.s / 60) / 30; + return Math.PI * (this.m + (this.s + this.ms / 1000) / 60) / 30; }, sAngle(): number { - return Math.PI * this.s / 30; + return Math.PI * (this.s + this.ms / 1000) / 30; }, graduations(): any { @@ -106,11 +109,17 @@ export default Vue.extend({ }, mounted() { - this.clock = setInterval(this.tick, 1000); + const update = () => { + if (this.enabled) { + this.tick(); + requestAnimationFrame(update); + } + }); + update(); }, beforeDestroy() { - clearInterval(this.clock); + enabled = false; }, methods: { |