Skip to content
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.

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

Extend IJsDialogHandler To Include OnBeforeUnload Dialogs #715

Merged
merged 5 commits into from Jan 11, 2015
Merged

Extend IJsDialogHandler To Include OnBeforeUnload Dialogs #715

merged 5 commits into from Jan 11, 2015

Conversation

daveaton
Copy link
Contributor

Extended IJsDialogHandler to catch on OnBeforeUnload Javascript Dialog messages.

This should fix the issue with #712

Extended IJsDialogHandler to catch on exit Javascript Dialog messages.
@daveaton
Copy link
Contributor Author

Not Sure how to update a pull request so I made a new one. Hope that was ok. It worries me that this failed appVeyor again.

@amaitland
Copy link
Member

Not Sure how to update a pull request so I made a new one

You just push more commits to the same branch, no need for a new PR.

It worries me that this failed appVeyor again.

All AppVeyor builds are failing for an as yet unknown reason.

@amaitland
Copy link
Member

@daveaton It looks like your pretty close. I have a few questions, I'll comment inline.

handled = handler->OnJSBeforeUnload(_browserControl, StringUtils::ToClr(message_text), is_reload, resultString);
if (handled)
{
callback->Continue(is_reload, StringUtils::ToNative(resultString));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should is_reload be passed as first param here?

@amaitland amaitland added this to the 37.0.1 milestone Jan 6, 2015
@daveaton
Copy link
Contributor Author

daveaton commented Jan 6, 2015

Hum... just learning how Git Hub works, it seems that it automatically pulls in changes, I thought I had to update the pull request some how.. but if this is the case doing a 1 to 1 master is not a good idea.. I should have created a branch and let you guys apply to master here... or am I wrong ? If I make changes later on will it not update this pull request automatically ?

@amaitland
Copy link
Member

Any change you push to a branch is included into a PR up until the point of it being merged. Long as you don't need to make other changes on your master branch, then this shouldn't be a problem 👍

@@ -98,6 +98,7 @@
<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/GotoSingleUsageImmediately/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you revert this change please? I'm guessing this was just an oversight.

@amaitland
Copy link
Member

@daveaton I see you made the changes 👍 I'll take this for a spin ASAP 😄

(When you push more commits github doesn't notify me, so as a future reference if you could post a comment when changes are complete that would be much appreciated).

@daveaton
Copy link
Contributor Author

@amaitland Sorry about that I did not want to seem pushy. I normally check stats about 1-3 times a day. I figured you were hard at work on v39 :) Now that I know I will start leaving comments.

@amaitland
Copy link
Member

@daveaton Just a quick, changes made, let me know if there's any further feedback would be perfect 😄

@daveaton
Copy link
Contributor Author

@amaitland Will do :)

@amaitland amaitland merged commit 82affbe into cefsharp:master Jan 11, 2015
@amaitland
Copy link
Member

@daveaton I merged this, made a few additional changes. You can review them here fce5f06

Basically I removed a few unnessicary params (The Js callback in Cef is generic, so only the first param was required).

I've tested with some basic scenarios, everything appears to be working. If you've got any comments please let me know 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants