diff --git a/Core/FormBrowser.cs b/Core/FormBrowser.cs index 061e28b6..59945dc6 100644 --- a/Core/FormBrowser.cs +++ b/Core/FormBrowser.cs @@ -80,7 +80,6 @@ public FormBrowser(PluginManager pluginManager, UpdaterSettings updaterSettings) this.browser.LoadingStateChanged += browser_LoadingStateChanged; this.browser.FrameLoadEnd += browser_FrameLoadEnd; this.browser.LoadError += browser_LoadError; - this.browser.AddressChanged += browser_AddressChanged; this.browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(this, notification)); this.browser.RegisterAsyncJsObject("$TDP", plugins.Bridge); @@ -166,7 +165,7 @@ private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){ } private void browser_LoadError(object sender, LoadErrorEventArgs e){ - if (!e.FailedUrl.StartsWith("http://td/") && !e.FailedUrl.StartsWith("td:")){ + if (!e.FailedUrl.StartsWith("http://td/")){ string errorPage = ScriptLoader.LoadResource("pages/error.html", true); if (errorPage != null){ @@ -175,15 +174,6 @@ private void browser_LoadError(object sender, LoadErrorEventArgs e){ } } - private void browser_AddressChanged(object sender, AddressChangedEventArgs e){ - if (e.Address.StartsWith("td:")){ - switch(e.Address){ - case "td:reload": ReloadToTweetDeck(); break; - case "td:exit": this.InvokeAsyncSafe(ForceClose); break; - } - } - } - private void FormBrowser_Activated(object sender, EventArgs e){ if (!isLoaded)return; diff --git a/Resources/Scripts/pages/error.html b/Resources/Scripts/pages/error.html index e28a564a..1fe944ba 100644 --- a/Resources/Scripts/pages/error.html +++ b/Resources/Scripts/pages/error.html @@ -42,8 +42,8 @@ <center> <h1>Connection Error</h1> <p>{err}</p> - <button onclick="location.href = 'td:reload'">Retry</button> - <button onclick="location.href = 'td:exit'">Exit</button> + <button onclick="location.href = 'https://tweetdeck.twitter.com'; [].forEach.call(document.getElementsByTagName('button'), e => e.style.visibility = 'hidden')">Retry</button> + <button onclick="window.close()">Exit</button> </center> </body> </html>