Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,6 +1,6 @@
{
"name": "@coderline/alphatab",
"version": "1.2.1",
"version": "1.2.2",
"description": "alphaTab is a music notation and guitar tablature rendering library",
"keywords": [
"guitar",
Expand Down
4 changes: 2 additions & 2 deletions src.csharp/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<Version>1.2.1</Version>
<AssemblyVersion>1.2.1.0</AssemblyVersion>
<Version>1.2.2</Version>
<AssemblyVersion>1.2.2.0</AssemblyVersion>
<FileVersion>$(AssemblyVersion)</FileVersion>
<Authors>Danielku15</Authors>
<Company>CoderLine</Company>
Expand Down
8 changes: 8 additions & 0 deletions src/Settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { DisplaySettings } from '@src/DisplaySettings';
import { ImporterSettings } from '@src/ImporterSettings';
import { FingeringMode, NotationMode, NotationSettings, NotationElement } from '@src/NotationSettings';
import { PlayerSettings } from '@src/PlayerSettings';
import { SettingsSerializer } from '@src/generated/SettingsSerializer';

/**
* This public class contains instance specific settings for alphaTab
Expand Down Expand Up @@ -57,4 +58,11 @@ export class Settings {
settings.setSongBookModeSettings();
return settings;
}

/**
* @target web
*/
public fillFromJson(json: any): void {
SettingsSerializer.fromJson(this, json);
}
}