Skip to content

Commit e3ded19

Browse files
LayoricLayoric
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into update-deps
2 parents ec8e622 + 5be777c commit e3ded19

File tree

12 files changed

+196
-12
lines changed

12 files changed

+196
-12
lines changed

‎lib/Gistlyn.Resources.dll

0 Bytes
Binary file not shown.

‎src/Gistlyn.AppWinForms/NativeHost.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ public bool OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType
119119
//Mute beep for known keyboard shortcuts
120120
if (modifiers == CefEventFlags.ControlDown)
121121
{
122+
if (key == (int) Keys.R)
123+
Program.Form.ChromiumBrowser.Reload();
124+
125+
if (key == (int)Keys.W)
126+
Program.Form.Close();
127+
122128
if (key == (int)Keys.S || key == (int)Keys.Enter || key == (int)Keys.Left || key == (int)Keys.Right)
123129
return false;
124130
}
@@ -128,7 +134,7 @@ public bool OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType
128134
//Implement Back/Forward
129135
if (key == (int) Keys.Left || key == (int) Keys.Right)
130136
{
131-
//Hack to prevent ALT + LEFT/RIGHT double firing on 1 key press navigate twice
137+
//Hack to prevent ALT + LEFT/RIGHT double firing/navigating when it was only pressed once
132138
if (stopwatch.ElapsedMilliseconds > 100)
133139
{
134140
if (key == (int)Keys.Left && Program.Form.ChromiumBrowser.CanGoBack)
@@ -149,7 +155,7 @@ public bool OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType
149155
return false;
150156
}
151157

152-
if (key == (int)Keys.Escape || key == (int)Keys.F11 || key == (int)Keys.OemQuestion)
158+
if (key == (int)Keys.Escape || key == (int)Keys.OemQuestion || key == (int)Keys.F11 || key == (int)Keys.F4)
153159
return false;
154160

155161
return isSystemKey;

‎src/Gistlyn.Resources/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Gistlyn.Resources/offline.html

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head lang="en">
4+
<meta charset="UTF-8">
5+
<meta name="description" content="Gistlyn lets you create, run and share your executable C# Github Gists. Powered by Roslyn C# Scripting, bring a Gist with a main.cs and Gistlyn will run it for you!" />
6+
<title>Gistlyn is offline</title>
7+
8+
<style>
9+
body {
10+
background-color: white;
11+
color: #000000;
12+
font-family: "Helvetica Neue", Helvetica, Verdana, Arial;
13+
margin: 0;
14+
font-size: 16px;
15+
}
16+
17+
h1 {
18+
color: #eee;
19+
font-size: 26px;
20+
font-weight: normal;
21+
margin: 0;
22+
padding: 0 0 0 5px;
23+
line-height: 48px;
24+
min-height: 48px;
25+
border-radius: 0px;
26+
border-bottom: 1px solid #191e23;
27+
background: #2c3742; /* Old browsers */
28+
background: -moz-linear-gradient(top, #2c3742 0%, #28303a 100%); /* FF3.6+ */
29+
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2c3742), color-stop(100%,#28303a)); /* Chrome,Safari4+ */
30+
background: -webkit-linear-gradient(top, #2c3742 0%,#28303a 100%); /* Chrome10+,Safari5.1+ */
31+
background: -o-linear-gradient(top, #2c3742 0%,#28303a 100%); /* Opera 11.10+ */
32+
background: -ms-linear-gradient(top, #2c3742 0%,#28303a 100%); /* IE10+ */
33+
background: linear-gradient(to bottom, #2c3742 0%,#28303a 100%); /* W3C */
34+
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2c3742', endColorstr='#28303a',GradientType=0 ); /* IE6-9 */
35+
}
36+
37+
a#logo {
38+
display: inline-block;
39+
width: 40px;
40+
height: 30px;
41+
vertical-align: sub;
42+
background-repeat: no-repeat;
43+
background-image: url(data:image/png;base64,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TUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS4xLjIiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjE8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOkNvbXByZXNzaW9uPjU8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjQwPC9leGlmOlBpeGVsWERpbWVuc2lvbj4KICAgICAgICAgPGV4aWY6Q29sb3JTcGFjZT4xPC9leGlmOkNvbG9yU3BhY2U+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj4zMDwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6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);
44+
}
45+
a {
46+
color: #428bca;
47+
text-decoration: none;
48+
}
49+
a:hover { color: #2a6496; }
50+
#body {
51+
padding: 40px;
52+
}
53+
</style>
54+
</head>
55+
<body>
56+
<h1>
57+
<a id="logo" href="https://servicestack.net" title="servicestack.net"></a>
58+
Gistlyn is offline
59+
</h1>
60+
61+
<div id="body">
62+
<p>
63+
Gistlyn is currently offline and will be back shortly, in the meantime you can try
64+
the alternative online version:
65+
</p>
66+
<ul>
67+
<li><a href="http://gistlyn.com">gistlyn.com</a> - Windows 2012 Server / .NET</li>
68+
<li><a href="http://mono.gistlyn.com">mono.gistlyn.com</a> - Ubuntu / mono</li>
69+
</ul>
70+
71+
<h3>Run Gistlyn on your Desktop</h3>
72+
<p>
73+
Alternatively you can also run a local version of Gistlyn on your Desktop:
74+
<ul>
75+
<li><a href="https://github.com/ServiceStack/dist/raw/master/Gistlyn/winforms-installer/Setup.exe">Windows Setup.exe</a> - Winforms Desktop App (requires .NET)</li>
76+
<li><a href="https://github.com/ServiceStack/dist/raw/master/Gistlyn/Gistlyn-console.zip">Gistlyn-console.zip</a> - Console App for Windows/OSX/Linux (requires .NET or Mono)</li>
77+
</ul>
78+
</p>
79+
80+
<p>&nbsp;</p>
81+
82+
<p>
83+
Follow <a href="twitter.com/gistlyn">@gistlyn</a> for updates.
84+
</p>
85+
86+
</div>
87+
</body>
88+
</html>

‎src/Gistlyn/AppHost.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ public partial class AppHost : AppHostBase
1010
public AppHost()
1111
: base("Gistlyn", typeof(RunScriptService).Assembly)
1212
{
13-
var defaultSettings = SharedAppHostConfig.GetMemoryAppSettings();
14-
OverrideAppSettings(defaultSettings);
15-
AppSettings = defaultSettings;
13+
var appSettings = SharedAppHostConfig.GetMemoryAppSettings();
14+
OverrideAppSettings(appSettings);
15+
AppSettings = appSettings;
1616
}
1717

1818
public override void Configure(Container container)

0 commit comments

Comments
 (0)