diff options
| author | Andreia Gaita <avidigal@novell.com> | 2009-01-29 10:21:59 +0300 |
|---|---|---|
| committer | Andreia Gaita <avidigal@novell.com> | 2009-01-29 10:21:59 +0300 |
| commit | dae2cf5e5a0843b606a0ced2ec117cf7ceab183d (patch) | |
| tree | 5e5c313a7a69adbb99fdf5f1d774ca993a815008 /docbrowser | |
| parent | e4b685b74fa1004506c0e888b789aae775c05610 (diff) | |
* MonoWebBrowserHtmlRender.cs: remove first load logic, there is no first load
anymore.
[Fixes #468694]
svn path=/trunk/mono-tools/; revision=124896
Diffstat (limited to 'docbrowser')
| -rwxr-xr-x[-rw-r--r--] | docbrowser/ChangeLog | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | docbrowser/MonoWebBrowserHtmlRender.cs | 27 |
2 files changed, 9 insertions, 24 deletions
diff --git a/docbrowser/ChangeLog b/docbrowser/ChangeLog index adbfe6c7..bdffc8e9 100644..100755 --- a/docbrowser/ChangeLog +++ b/docbrowser/ChangeLog @@ -1,3 +1,9 @@ +2009-01-29 Andreia Gaita <shana@jitted.com> + + * MonoWebBrowserHtmlRender.cs: remove first load logic, there is no first + load anymore. + [Fixes #468694] + 2008-11-13 Andreia Gaita <shana@jitted.com> * MonoWebBrowserHtmlRender.cs: Add printing support diff --git a/docbrowser/MonoWebBrowserHtmlRender.cs b/docbrowser/MonoWebBrowserHtmlRender.cs index 6c1c6352..f0fa9c8e 100644..100755 --- a/docbrowser/MonoWebBrowserHtmlRender.cs +++ b/docbrowser/MonoWebBrowserHtmlRender.cs @@ -36,7 +36,6 @@ namespace Monodoc { BrowserWidget html_panel; RootTree help_tree; - bool loaded = false; public MonoWebBrowserHtmlRender (RootTree help_tree) { @@ -100,25 +99,12 @@ namespace Monodoc if (OnUrl != null) OnUrl (this, new EventArgs ()); }; - loadEvent = new LoadFinishedEventHandler (loadFinished); - html_panel.browser.LoadFinished += loadEvent; }; cache_imgs = new Hashtable(); tmpPath = Path.Combine (Path.GetTempPath (), "monodoc"); return html_panel.browser.Initialized; } - void loadFinished (object sender, LoadFinishedEventArgs e) { - loaded = true; - if (firstLoadPath != null) - html_panel.browser.Navigation.Go (firstLoadPath); - else if (firstLoadHtml != null) - html_panel.browser.Render (firstLoadHtml); - html_panel.browser.LoadFinished -= loadEvent; - firstLoadPath = null; - firstLoadHtml = null; - } - // URL like T:System.Activator are lower cased by gecko to t.;System.Activator // so we revert that string CheckUrl (string u) @@ -131,8 +117,7 @@ namespace Monodoc static int tmp_file = 0; string tmpPath; Hashtable cache_imgs; - string firstLoadHtml = null; - string firstLoadPath = null; + public void Render (string html_code) { string r = ProcessImages (html_code); @@ -145,15 +130,9 @@ namespace Monodoc sw.Write (r); sw.Close (); } - if (loaded) - html_panel.browser.Navigation.Go (filepath); - else - firstLoadPath = filepath; + html_panel.browser.Navigation.Go (filepath); } else { - if (loaded) - html_panel.browser.Render (r); - else - firstLoadHtml = r; + html_panel.browser.Render (r); } } |