Skip to content

fix: socket.connnect JS : Scope & Closures #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GregorBiswanger merged 16 commits into from
Jul 22, 2018
Merged

fix: socket.connnect JS : Scope & Closures #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
53c591f
Merge pull request #1 from ElectronNET/master
mojinxun Feb 9, 2018
3ba46a3
1
Feb 9, 2018
ad20230
Merge branch 'master' of https://github.com/mojinxun/Electron.NET
Feb 9, 2018
e20dafb
resume csproj
Feb 28, 2018
0997291
fix: possible eventemitter memory leak delected
Apr 18, 2018
ef1f0ab
registerIpcMainChannel remove channel
May 7, 2018
e3eee0c
1
May 30, 2018
949741d
getWindowById(id) add undefined check
May 30, 2018
1bf274a
1. getWindowById(id) add undefined check
May 31, 2018
354b4f0
add loadingWindow
Jun 13, 2018
a874243
loadingWindow add devTools
Jun 13, 2018
8e38c1f
add makeSingleInstance
Jun 14, 2018
e7a9ee0
update manifestFile setting
Jun 14, 2018
fcbefa6
中文问题编码
Jul 14, 2018
86aae5e
finish pack check
Jul 14, 2018
85127be
config
Jul 16, 2018
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
9 changes: 8 additions & 1 deletion ElectronNET.API/Dialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Web;

namespace ElectronNET.API
{
Expand Down Expand Up @@ -54,7 +56,12 @@ public Task<string[]> ShowOpenDialogAsync(BrowserWindow browserWindow, OpenDialo
BridgeConnector.Socket.Off("showOpenDialogComplete" + guid);

var result = ((JArray)filePaths).ToObject<string[]>();
taskCompletionSource.SetResult(result);
var list = new List<string>();
foreach (var item in result)
{
list.Add(HttpUtility.UrlDecode(item));
}
taskCompletionSource.SetResult(list.ToArray());
});


Expand Down
4 changes: 3 additions & 1 deletion ElectronNET.API/ElectronNET.API.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ This package contains the API to access the "native" electron API.</Description>
<PackageTags>electron aspnetcore</PackageTags>
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
<PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
<Version>1.0.0.2</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand All @@ -31,8 +32,9 @@ This package contains the API to access the "native" electron API.</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EngineIoClientDotNet" Version="1.0.7.2" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
<PackageReference Include="SocketIoClientDotNet" Version="1.0.3" />
<PackageReference Include="SocketIoClientDotNet" Version="1.0.7.2" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
Expand Down
1 change: 1 addition & 0 deletions ElectronNET.API/IpcMain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ internal static IpcMain Instance
public void On(string channel, Action<object> listener)
{
BridgeConnector.Socket.Emit("registerIpcMainChannel", channel);
BridgeConnector.Socket.Off(channel);
BridgeConnector.Socket.On(channel, (args) =>
{
List<object> objectArray = FormatArguments(args);
Expand Down
2 changes: 1 addition & 1 deletion ElectronNET.CLI/ElectronNET.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageOutputPath>..\artifacts</PackageOutputPath>
<PackageId>ElectronNET.CLI</PackageId>
<Version>1.0.0</Version>
<Version>1.0.4.2</Version>
<Authors>Gregor Biswanger, Robert Muehsig</Authors>
<Product>Electron.NET</Product>
<Company />
Expand Down
68 changes: 34 additions & 34 deletions ElectronNET.Host/api/app.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading