Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
anoyetta committed May 30, 2019
2 parents 83c0662 + d961242 commit bf60bb7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion source/kagami.Core/KagamiOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected override async void Update()

var updateScript =
$"var model =\n{ json };\n\n" +
"document.dispatchEvent(new CustomEvent('onOverlayDataUpdate', { detail: model }));\n";
"document.dispatchEvent(new CustomEvent('onActionUpdated', { detail: model }));\n";

this.Overlay?.Renderer?.Browser?.GetMainFrame()?.ExecuteJavaScript(
updateScript,
Expand Down
6 changes: 3 additions & 3 deletions source/kagami.Core/Version.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;

[assembly: AssemblyVersion("0.0.10.0")]
using System.Reflection;

[assembly: AssemblyVersion("0.0.11.0")]
[assembly: AssemblyConfiguration("Alpha")]
2 changes: 1 addition & 1 deletion source/kagami.Core/resources/kagami/debug.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</style>

<script>
document.addEventListener("onOverlayDataUpdate", function (e) {
document.addEventListener("onActionUpdated", function (e) {
update(e.detail);
});

Expand Down
2 changes: 1 addition & 1 deletion source/kagami/Version.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;

[assembly: AssemblyVersion("0.0.10.0")]
[assembly: AssemblyVersion("0.0.11.0")]
[assembly: AssemblyConfiguration("Alpha")]

0 comments on commit bf60bb7

Please sign in to comment.