diff --git a/Browser.cs b/Browser.cs index 15a2f6b3..d47af1fd 100644 --- a/Browser.cs +++ b/Browser.cs @@ -27,14 +27,7 @@ namespace VRCX Size = new Size(texture.Description.Width, texture.Description.Height); RenderHandler.Dispose(); RenderHandler = new RenderHandler(this, m_Lock); - var options = new BindingOptions() - { - CamelCaseJavascriptNames = false - }; - JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options); - JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options); - JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options); - JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options); + Util.RegisterBindings(JavascriptObjectRepository); } public new void Dispose() diff --git a/MainForm.cs b/MainForm.cs index 628fc1f1..a2ed267a 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -47,16 +47,7 @@ namespace VRCX }, Dock = DockStyle.Fill, }; - var options = new BindingOptions() - { - CamelCaseJavascriptNames = false - }; - Browser.JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options); - Browser.JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options); - Browser.JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options); - Browser.JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options); - Browser.JavascriptObjectRepository.Register("LogWatcher", LogWatcher.Instance, true, options); - Browser.JavascriptObjectRepository.Register("Discord", Discord.Instance, true, options); + Util.RegisterBindings(Browser.JavascriptObjectRepository); Browser.IsBrowserInitializedChanged += (A, B) => { // Browser.ShowDevTools(); diff --git a/Util.cs b/Util.cs new file mode 100644 index 00000000..d2667e50 --- /dev/null +++ b/Util.cs @@ -0,0 +1,21 @@ +using CefSharp; + +namespace VRCX +{ + public static class Util + { + public static void RegisterBindings(IJavascriptObjectRepository repository) + { + var options = new BindingOptions() + { + CamelCaseJavascriptNames = false + }; + repository.Register("VRCX", VRCX.Instance, true, options); + repository.Register("SharedVariable", SharedVariable.Instance, false, options); + repository.Register("VRCXStorage", VRCXStorage.Instance, false, options); + repository.Register("SQLite", SQLite.Instance, false, options); + repository.Register("LogWatcher", LogWatcher.Instance, true, options); + repository.Register("Discord", Discord.Instance, true, options); + } + } +} \ No newline at end of file diff --git a/VRCX.csproj b/VRCX.csproj index bbd2864e..4b3b18a9 100644 --- a/VRCX.csproj +++ b/VRCX.csproj @@ -133,6 +133,7 @@ + Form diff --git a/VRForm.cs b/VRForm.cs index 47b3ec89..0cddf8a1 100644 --- a/VRForm.cs +++ b/VRForm.cs @@ -46,22 +46,8 @@ namespace VRCX { CamelCaseJavascriptNames = false }; - Browser1.JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options); - Browser1.JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options); - Browser1.JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options); - Browser1.JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options); - Browser2.JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options); - Browser2.JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options); - Browser2.JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options); - Browser2.JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options); - Browser1.IsBrowserInitializedChanged += (A, B) => - { - // Browser1.ShowDevTools(); - }; - Browser2.IsBrowserInitializedChanged += (A, B) => - { - // Browser2.ShowDevTools(); - }; + Util.RegisterBindings(Browser1.JavascriptObjectRepository); + Util.RegisterBindings(Browser2.JavascriptObjectRepository); panel1.Controls.Add(Browser1); panel2.Controls.Add(Browser2); }