OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-14 01:50:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/syuilo/misskey

Browse source
This commit is contained in:
syuilo 2018-07-18 00:47:11 +09:00
commit b274c4160e
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -205,7 +205,7 @@
"vue-cropperjs": "2.2.1",
"vue-js-modal": "1.3.16",
"vue-json-tree-view": "2.1.4",
"vue-loader": "15.2.4",
"vue-loader": "15.2.5",
"vue-router": "3.0.1",
"vue-template-compiler": "2.5.16",
"vuedraggable": "2.16.0",

21
src/client/app/common/views/components/analog-clock.vue
View file

@ -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);
this.enabled = false;
},
methods: {