Skip to content

Commit

Permalink
v1.2.10
Browse files Browse the repository at this point in the history
+ 保存時のアニメーションを実装
  • Loading branch information
GenbuHase committed Feb 18, 2020
1 parent 1213897 commit 60682d4
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 12 deletions.
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

"name": "__MSG_app_name__",
"description": "__MSG_app_description__",
"version": "1.2.9",
"version": "1.2.10",

"default_locale": "en",
"homepage_url": "https://github.com/GenbuHase/BouyomiLauncher",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "genbuhase_bouyomi-launcher",
"version": "1.2.9",
"version": "1.2.10",
"main": "index.js",
"scripts": {
"start": "serve -l 8001",
Expand Down
9 changes: 6 additions & 3 deletions views/Settings/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ <H6 Class = "ui sub header">
<Span Class = "sub header">{{ __MSG_view_Settings_form_nativeBouyomiConfig_speed__description__ }}</Span>
</H6>

<Div Class = "field ui input fluid">
<Div Class = "field ui icon input fluid">
<Input ID = "form_nativeBouyomiConfig_speed" Data-Config-Key = "speed" Type = "number" Min = "0.1" Max = "10" Step = "0.1" />
<I Class = "icon check"></I>
</Div>


Expand All @@ -79,8 +80,9 @@ <H6 Class = "ui sub header">
<Span Class = "sub header">{{ __MSG_view_Settings_form_nativeBouyomiConfig_pitch__description__ }}</Span>
</H6>

<Div Class = "field ui input fluid">
<Div Class = "field ui icon input fluid">
<Input ID = "form_nativeBouyomiConfig_pitch" Data-Config-Key = "pitch" Type = "number" Min = "0" Max = "2" Step = "0.1" />
<I Class = "icon check"></I>
</Div>


Expand All @@ -89,8 +91,9 @@ <H6 Class = "ui sub header">
<Span Class = "sub header">{{ __MSG_view_Settings_form_nativeBouyomiConfig_volume__description__ }}</Span>
</H6>

<Div Class = "field ui input fluid">
<Div Class = "field ui icon input fluid">
<Input ID = "form_nativeBouyomiConfig_volume" Data-Config-Key = "volume" Type = "number" Min = "0" Max = "1" Step = "0.1" />
<I Class = "icon check"></I>
</Div>


Expand Down
19 changes: 13 additions & 6 deletions views/Settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,15 @@ I18n.autoApply()
.each(function () {
this.dataset.storageKey = BOUYOMI_TYPE;

this.addEventListener("change", () => {
this.addEventListener("change", async () => {
const field = $(this).parent(".ui.field");
field.addClass("loading");

const bouyomiType = this.value;
storage.set(this.dataset.storageKey, bouyomiType);
await storage.set(this.dataset.storageKey, bouyomiType);

animateByBouyomiType(bouyomiType);
field.removeClass("loading");
});
})
.dropdown("set selected", stored);
Expand All @@ -61,17 +65,22 @@ I18n.autoApply()
.find(SELECTORS.Form_NativeBouyomiConfig_Input)
.each(function () {
this.addEventListener("change", async () => {
const field = $(this).parent(".ui.field");
field.addClass("loading");

const config = Object.assign({}, bouyomi._nativeClient.defaultConfig, await storage.get(NATIVE_BOUYOMI_CONFIG));

const isValid = this.reportValidity();
$(this).parent(".ui.field")[!isValid ? "addClass" : "removeClass"]("error");

if (!isValid) return;
storage.set(NATIVE_BOUYOMI_CONFIG,
await storage.set(NATIVE_BOUYOMI_CONFIG,
Object.assign(config, {
[this.dataset.configKey]: this.value
})
);

field.removeClass("loading");
});
});

Expand Down Expand Up @@ -122,9 +131,7 @@ I18n.autoApply()
elem.dataset.storageKey = STORAGE_KEYS.SERVICES,
elem.dataset.serviceKey = service;

elem.addEventListener("change", () => {
storage.set(key, fieldElem_input.checked);
});
elem.addEventListener("change", () => storage.set(key, fieldElem_input.checked));

return elem;
})();
Expand Down

0 comments on commit 60682d4

Please sign in to comment.