diff options
author | Connor Brewster <brewsterc@my.caspercollege.edu> | 2016-04-25 14:59:48 -0600 |
---|---|---|
committer | Connor Brewster <brewsterc@my.caspercollege.edu> | 2016-05-03 22:09:35 -0600 |
commit | dc85be4be5510f9ef204a35ea7461f645cbc7e39 (patch) | |
tree | d8273b417823db1fbe6f5e18a693b77c510359be /components/script_traits/script_msg.rs | |
parent | 3f2ceeff5dd1966dafe34381e20ec405ab72ccee (diff) | |
download | servo-dc85be4be5510f9ef204a35ea7461f645cbc7e39.tar.gz servo-dc85be4be5510f9ef204a35ea7461f645cbc7e39.zip |
Implement alert dialogs
Fixed conflict
Fixed merge issue
Finished implementation
Disable tinyfiledialogs on Windows
addressed comments
Use ancestor's SubpageId
Move display alert from method to function
Add extra test for nested iframes
Addressed comments
Updated tinyfiledialogs
Diffstat (limited to 'components/script_traits/script_msg.rs')
-rw-r--r-- | components/script_traits/script_msg.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index 14aa50b6a83..aee49bac43f 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -81,4 +81,6 @@ pub enum ScriptMsg { SetDocumentState(PipelineId, DocumentState), /// Update the pipeline Url, which can change after redirections. SetFinalUrl(PipelineId, Url), + /// Check if an alert dialog box should be presented + Alert(PipelineId, String, IpcSender<bool>), } |