From 88734eea5152d166959a225923d26455130b0d18 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Wed, 3 Nov 2021 17:30:51 +0100
Subject: [PATCH] Backport FillFromJson and bump version

---
 package-lock.json                | 2 +-
 package.json                     | 2 +-
 src.csharp/Directory.Build.props | 4 ++--
 src/Settings.ts                  | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7ff529f64..fb0ace807 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@coderline/alphatab",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index eb806bd82..a52eec40b 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src.csharp/Directory.Build.props b/src.csharp/Directory.Build.props
index 083b61b43..32de93ab8 100644
--- a/src.csharp/Directory.Build.props
+++ b/src.csharp/Directory.Build.props
@@ -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>
diff --git a/src/Settings.ts b/src/Settings.ts
index 9ff8e01fa..689a2d8da 100644
--- a/src/Settings.ts
+++ b/src/Settings.ts
@@ -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
@@ -57,4 +58,11 @@ export class Settings {
         settings.setSongBookModeSettings();
         return settings;
     }
+
+    /**
+     * @target web
+     */
+    public fillFromJson(json: any): void {
+        SettingsSerializer.fromJson(this, json);
+    }
 }