chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-05-22 08:34:05 +02:00
Code

Minor refactoring of ScriptLoader.ExecuteFile to generate identifier automatically

Browse Source
This commit is contained in:
chylex 2016-06-30 15:34:54 +02:00
parent b531016c7b
commit 8e01d5ec84
3 changed files with 6 additions and 9 deletions

2
Core/FormBrowser.cs
View File

@ -122,7 +122,7 @@ private void Browser_LoadingStateChanged(object sender, LoadingStateChangedEvent
private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){ private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
if (e.Frame.IsMain){ if (e.Frame.IsMain){
ScriptLoader.ExecuteFile(browser,"code.js","root:code"); ScriptLoader.ExecuteFile(browser,"code.js");
plugins_Reloaded(plugins,new PluginLoadEventArgs(new string[0])); plugins_Reloaded(plugins,new PluginLoadEventArgs(new string[0]));
} }
} }

10
Resources/ScriptLoader.cs
View File

@ -1,9 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Linq;
using CefSharp; using CefSharp;
using CefSharp.WinForms; using CefSharp.WinForms;
@ -20,12 +18,12 @@ public static string LoadResource(string name){
} }
} }
public static void ExecuteFile(ChromiumWebBrowser browser, string file, string identifier){ public static void ExecuteFile(ChromiumWebBrowser browser, string file){
ExecuteScript(browser,LoadResource(file),identifier); ExecuteScript(browser,LoadResource(file),"root:"+Path.GetFileNameWithoutExtension(file));
} }
public static void ExecuteFile(IFrame frame, string file, string identifier){ public static void ExecuteFile(IFrame frame, string file){
ExecuteScript(frame,LoadResource(file),identifier); ExecuteScript(frame,LoadResource(file),"root:"+Path.GetFileNameWithoutExtension(file));
} }
public static void ExecuteScript(ChromiumWebBrowser browser, string script, string identifier){ public static void ExecuteScript(ChromiumWebBrowser browser, string script, string identifier){

3
Updates/UpdateHandler.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Linq;
using CefSharp; using CefSharp;
using CefSharp.WinForms; using CefSharp.WinForms;
using TweetDck.Core; using TweetDck.Core;
@ -25,7 +24,7 @@ public UpdateHandler(ChromiumWebBrowser browser, FormBrowser form){
private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){ private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
if (e.Frame.IsMain){ if (e.Frame.IsMain){
ScriptLoader.ExecuteFile(e.Frame,"update.js","root:update"); ScriptLoader.ExecuteFile(e.Frame,"update.js");
} }
} }