Commit be8bd0e6 authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard

mshtml: Treat edit mode as a reload.

parent a44ce98d
...@@ -283,7 +283,7 @@ static void parse_complete(HTMLDocumentObj *doc) ...@@ -283,7 +283,7 @@ static void parse_complete(HTMLDocumentObj *doc)
call_property_onchanged(&doc->cp_container, 1005); call_property_onchanged(&doc->cp_container, 1005);
call_explorer_69(doc); call_explorer_69(doc);
if(doc->webbrowser && doc->nscontainer->usermode != EDITMODE && !(doc->window->load_flags & BINDING_REFRESH)) if(doc->webbrowser && !(doc->window->load_flags & BINDING_REFRESH))
IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->window->base.IHTMLWindow2_iface, 0); IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->window->base.IHTMLWindow2_iface, 0);
/* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */
......
...@@ -358,8 +358,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event ...@@ -358,8 +358,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event
update_title(doc_obj); update_title(doc_obj);
} }
if(doc_obj && doc_obj->nscontainer->usermode != EDITMODE && doc_obj->doc_object_service if(doc_obj && doc_obj->doc_object_service && !(doc->outer_window->load_flags & BINDING_REFRESH))
&& !(doc->outer_window->load_flags & BINDING_REFRESH))
IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service,
&doc->outer_window->base.IHTMLWindow2_iface, 0); &doc->outer_window->base.IHTMLWindow2_iface, 0);
......
...@@ -413,6 +413,9 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind ...@@ -413,6 +413,9 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind
} }
} }
if(doc_obj->nscontainer->usermode == EDITMODE)
window->load_flags = BINDING_REFRESH;
download_task = malloc(sizeof(download_proc_task_t)); download_task = malloc(sizeof(download_proc_task_t));
download_task->doc = doc_obj; download_task->doc = doc_obj;
download_task->set_download = set_download; download_task->set_download = set_download;
......
...@@ -582,7 +582,6 @@ static void _test_navigation_type(unsigned line, IUnknown *unk) ...@@ -582,7 +582,6 @@ static void _test_navigation_type(unsigned line, IUnknown *unk)
IHTMLPerformanceNavigation_Release(nav); IHTMLPerformanceNavigation_Release(nav);
expected = is_refresh || editmode ? 1 : is_from_hist ? 2 : 0; expected = is_refresh || editmode ? 1 : is_from_hist ? 2 : 0;
todo_wine_if(editmode)
ok_(__FILE__,line)(type == expected, "type = %lu, expected %lu\n", type, expected); ok_(__FILE__,line)(type == expected, "type = %lu, expected %lu\n", type, expected);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment