Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-22 09:37:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix some type errors in System

Browse source
This commit is contained in:
Jordan Eldredge 2019-09-20 06:44:43 -07:00
parent 4d55557f7f
commit 09bf9a73dc
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modern/src/runtime/AnimatedLayer.ts
View file

@ -15,7 +15,7 @@ class AnimatedLayer extends Layer {
this._convertAttributeTypes();
this._initializeStartAndEnd();
this._playing = this.attributes.autoplay;
this._playing = Boolean(this.attributes.autoplay);
this._frameNum = this.attributes.start || 0;
this._animationStartTime = 0;

27
modern/src/runtime/System.ts
View file

@ -8,6 +8,9 @@ import {
import * as Actions from "../Actions";
import * as Selectors from "../Selectors";
import { ModernStore } from "../types";
import Layout from "./Layout";
import { Context } from "react";
import GuiObject from "./GuiObject";
class System extends MakiObject {
scriptGroup: Group;
@ -15,7 +18,7 @@ class System extends MakiObject {
_store: ModernStore;
_privateInt: Map<string, Map<string, number>>;
_privateString: Map<string, Map<string, string>>;
constructor(scriptGroup, store) {
constructor(scriptGroup, store: ModernStore) {
super(null, null, {});
this._store = store;
@ -124,7 +127,7 @@ class System extends MakiObject {
if (!this._privateInt.has(section)) {
return defvalue;
}
this._privateInt.get(section).get(item);
return this._privateInt.get(section).get(item);
}
// I think `defvalue` here is a typo that we inherited from std.mi. It should just be `value`.
@ -132,6 +135,7 @@ class System extends MakiObject {
if (!this._privateInt.has(section)) {
this._privateInt.set(section, new Map([[item, defvalue]]));
} else {
// @ts-ignore We know the section exists
this._privateInt.get(section).set(item, defvalue);
}
}
@ -200,15 +204,15 @@ class System extends MakiObject {
this.js_trigger("onAccelerator", action, section, key);
}
oncreatelayout(_layout): void {
oncreatelayout(_layout: Layout): void {
this.js_trigger("onCreateLayout", _layout);
}
onshowlayout(_layout): void {
onshowlayout(_layout: Layout): void {
this.js_trigger("onShowLayout", _layout);
}
onhidelayout(_layout): void {
onhidelayout(_layout: Layout): void {
this.js_trigger("onHideLayout", _layout);
}
@ -562,9 +566,8 @@ class System extends MakiObject {
return encodeURI(url);
}
removepath(str: string): string {
removepath(str: string) {
unimplementedWarning("removepath");
return;
}
getpath(str: string) {
@ -625,6 +628,7 @@ class System extends MakiObject {
if (!this._privateString.has(section)) {
this._privateString.set(section, new Map([[item, value]]));
} else {
// @ts-ignore We know the section exists
this._privateString.get(section).set(item, value);
}
}
@ -633,6 +637,7 @@ class System extends MakiObject {
if (!this._privateString.has(section)) {
return defvalue;
}
// @ts-ignore We know the section exists
this._privateString.get(section).get(item);
}
@ -761,7 +766,7 @@ class System extends MakiObject {
return;
}
isobjectvalid(o) {
isobjectvalid(o: MakiObject) {
unimplementedWarning("isobjectvalid");
return;
}
@ -822,7 +827,7 @@ class System extends MakiObject {
return;
}
triggeraction(context, actionname: string, actionparam: string) {
triggeraction(context: GuiObject, actionname: string, actionparam: string) {
unimplementedWarning("triggeraction");
return;
}
@ -836,7 +841,7 @@ class System extends MakiObject {
return;
}
hidewindow(hw) {
hidewindow(hw: GuiObject) {
unimplementedWarning("hidewindow");
return;
}
@ -851,7 +856,7 @@ class System extends MakiObject {
return;
}
setatom(atomname: string, object) {
setatom(atomname: string, object: MakiObject) {
unimplementedWarning("setatom");
return;
}