-
{info.getTitle()}
- {name =
{info.getName()}
}
+
{info.title}
+ {name =
{info.name}
}
{controls =
}
{state =
}
@@ -103,7 +103,7 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
let buffer, source;
try {
state.textContent = 'Loading...';
- buffer = await manager.loadBuffer(info.getSources());
+ buffer = await manager.loadBuffer(info.sources);
name.textContent += ` (${buffer.duration})`;
source = audio.createSource(buffer, settings.get('soundReverse'));
@@ -111,10 +111,10 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
state.textContent = 'Configuring...';
const rate = settings.get('soundRate');
- source.setRate(rate);
+ source.rate = rate;
const detune = settings.get('soundDetune');
- source.setDetune(detune);
+ source.detune = detune;
const loopStart = settings.get('soundLoopStart');
const loopEnd = settings.get('soundLoopEnd');
@@ -136,10 +136,9 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
}
};
- const names = library.names();
- for(const name of names) {
+ for(const name of library.names) {
const info = library.info(name);
- libraryButtons.appendChild(
);
+ libraryButtons.appendChild(
);
}
searchBox.addEventListener('change', () => {
@@ -149,7 +148,7 @@ const MamiSoundTest = function(settings, audio, manager, library, clickPos) {
});
return {
- getElement: () => container,
+ get element() { return container; },
onViewPop: async () => {
for(const source of sources)
source.stop();
diff --git a/src/mami.js/sound/umisound.js b/src/mami.js/sound/umisound.js
index daf712d..31d3630 100644
--- a/src/mami.js/sound/umisound.js
+++ b/src/mami.js/sound/umisound.js
@@ -12,7 +12,7 @@ Umi.Sound = (() => {
return;
if(mami.settings.get('seinfeld'))
- return Seinfeld.getRandom();
+ return Seinfeld.random;
if(minecraft === 'yes')
return 'minecraft:door:open';
diff --git a/src/mami.js/srle.js b/src/mami.js/srle.js
index 00da67d..981fc68 100644
--- a/src/mami.js/srle.js
+++ b/src/mami.js/srle.js
@@ -1,9 +1,9 @@
const MamiSRLE = (() => {
return {
encode: (input, cutoff) => {
- let output = '',
- last = '',
- repeat = 0;
+ let output = '';
+ let last = '';
+ let repeat = 0;
input = (input || '').toString();
cutoff = cutoff || 1
@@ -33,9 +33,9 @@ const MamiSRLE = (() => {
},
decode: input => {
- let output = '',
- repeat = '',
- chr;
+ let output = '';
+ let repeat = '';
+ let chr;
input = (input || '').toString().split('').reverse();
diff --git a/src/mami.js/themes.js b/src/mami.js/themes.js
index b4b37ce..2a39816 100644
--- a/src/mami.js/themes.js
+++ b/src/mami.js/themes.js
@@ -317,10 +317,8 @@ const UmiThemeApply = function(theme) {
}
const coloursPfx = varPfx + 'colour-';
-
- for(const propName in theme.colours) {
+ for(const propName in theme.colours)
document.body.style.setProperty(coloursPfx + propName, MamiColour.hex(theme.colours[propName]));
- }
}
if(theme.sizes) {
diff --git a/src/mami.js/txtrigs.js b/src/mami.js/txtrigs.js
index d614286..7ece0ea 100644
--- a/src/mami.js/txtrigs.js
+++ b/src/mami.js/txtrigs.js
@@ -1,6 +1,6 @@
const MamiTextTrigger = function(info) {
- const type = info.type,
- match = info.match;
+ const type = info.type;
+ const match = info.match;
for(const i in match) {
match[i] = match[i].split(';');
@@ -9,10 +9,10 @@ const MamiTextTrigger = function(info) {
}
const pub = {
- getType: function() { return type; },
- isSoundType: function() { return type === 'sound'; },
- isAliasType: function() { return type === 'alias'; },
- isMatch: function(matchText) {
+ get type() { return type; },
+ get isSoundType() { return type === 'sound'; },
+ get isAliasType() { return type === 'alias'; },
+ isMatch: matchText => {
for(const i in match) {
const out = (function(filters, text) {
let result = false;
@@ -61,22 +61,41 @@ const MamiTextTrigger = function(info) {
};
if(type === 'sound') {
- const volume = info.volume || 1.0,
- rate = info.rate || 1.0,
- names = info.sounds || [];
+ const volume = info.volume ?? 1.0;
+ const rate = info.rate ?? 1.0;
+ const names = info.sounds ?? [];
- pub.getVolume = function() { return volume; };
- pub.getRate = function() {
- if(rate === 'rng')
- return 1.8 - (Math.random() * 1.5);
- return rate;
- };
- pub.getSoundNames = function() { return names; };
- pub.getRandomSoundName = function() { return names[Math.floor(Math.random() * names.length)]; };
+ Object.defineProperties(pub, {
+ volume: {
+ enumerable: true,
+ get() { return volume; },
+ },
+ rate: {
+ enumerable: true,
+ get() {
+ if(rate === 'rng')
+ return 1.8 - (Math.random() * 1.5);
+ return rate;
+ },
+ },
+ soundNames: {
+ enumerable: true,
+ get() { return names; },
+ },
+ getRandomSoundName: {
+ enumerable: true,
+ value: () => names[Math.floor(Math.random() * names.length)],
+ },
+ });
} else if(type === 'alias') {
- const aliasFor = info.for || [];
+ const aliasFor = info.for ?? [];
- pub.getFor = function() { return aliasFor; };
+ Object.defineProperties(pub, {
+ for: {
+ enumerable: true,
+ get() { return aliasFor; },
+ },
+ });
} else
throw 'Unsupported trigger type.';
@@ -97,8 +116,8 @@ const MamiTextTriggers = function() {
for(const i in triggers) {
let trigger = triggers[i];
if(trigger.isMatch(text)) {
- if(trigger.isAliasType() && !returnAlias) {
- const aliasFor = trigger.getFor();
+ if(trigger.isAliasType && !returnAlias) {
+ const aliasFor = trigger.for;
trigger = getTrigger(aliasFor[Math.floor(Math.random() * aliasFor.length)]);
}
@@ -111,7 +130,7 @@ const MamiTextTriggers = function() {
return {
addTrigger: addTrigger,
- addTriggers: function(triggerInfos) {
+ addTriggers: triggerInfos => {
for(const i in triggerInfos)
try {
addTrigger(triggerInfos[i]);
@@ -119,10 +138,10 @@ const MamiTextTriggers = function() {
console.error(ex);
}
},
- clearTriggers: function() {
+ clearTriggers: () => {
triggers = [];
},
- hasTriggers: function() {
+ get hasTriggers() {
return triggers.length > 0;
},
getTrigger: getTrigger,
diff --git a/src/mami.js/ui/loading-overlay.jsx b/src/mami.js/ui/loading-overlay.jsx
index 0f38fe9..d59575d 100644
--- a/src/mami.js/ui/loading-overlay.jsx
+++ b/src/mami.js/ui/loading-overlay.jsx
@@ -38,12 +38,13 @@ Umi.UI.LoadingOverlay = function(icon, header, message) {
setMessage(message);
return {
- setIcon: setIcon,
- setHeader: setHeader,
- setMessage: setMessage,
- getElement: function() {
- return html;
- },
+ get icon() { return iconElem.className; },
+ set icon(value) { setIcon(value); },
+ get header() { return headerElem.textContent; },
+ set header(value) { setHeader(value); },
+ get message() { return messageElem.innerHTML; },
+ set message(value) { setMessage(value); },
+ get element() { return html; },
getViewTransition: mode => {
if(mode === 'pop')
return ctx => MamiAnimate({
diff --git a/src/mami.js/ui/markup.js b/src/mami.js/ui/markup.js
index e75b640..553efbd 100644
--- a/src/mami.js/ui/markup.js
+++ b/src/mami.js/ui/markup.js
@@ -29,7 +29,7 @@ Umi.UI.Markup = (function() {
presets: futami.get('colours'),
});
- pickerTarget.appendChild(picker.getElement());
+ pickerTarget.appendChild(picker.element);
picker.dialog(picker.suggestPosition(ev))
.then(colour => insertRaw(`[color=${MamiColour.hex(colour)}]`, '[/color]'))
diff --git a/src/mami.js/ui/messages.jsx b/src/mami.js/ui/messages.jsx
index 4f8aedf..3e48b2f 100644
--- a/src/mami.js/ui/messages.jsx
+++ b/src/mami.js/ui/messages.jsx
@@ -136,11 +136,11 @@ Umi.UI.Messages = (function() {
if(mami.settings.get('playJokeSounds'))
try {
const trigger = mami.textTriggers.getTrigger(msgText);
- if(trigger.isSoundType()) {
+ if(trigger.isSoundType) {
soundIsLegacy = false;
soundName = trigger.getRandomSoundName();
- soundVolume = trigger.getVolume();
- soundRate = trigger.getRate();
+ soundVolume = trigger.volume;
+ soundRate = trigger.rate;
}
} catch(ex) {}
} else {
diff --git a/src/mami.js/utility.js b/src/mami.js/utility.js
index 6f6d8fc..cb87368 100644
--- a/src/mami.js/utility.js
+++ b/src/mami.js/utility.js
@@ -118,7 +118,7 @@ const $e = function(info, attrs, child, created) {
elem.appendChild(childElem);
else
elem.appendChild($e(child));
- } else if(child.getElement) {
+ } else if('getElement' in child) {
const childElem = child.getElement();
if(childElem instanceof Element)
elem.appendChild(childElem);