From dc85be4be5510f9ef204a35ea7461f645cbc7e39 Mon Sep 17 00:00:00 2001
From: Connor Brewster <brewsterc@my.caspercollege.edu>
Date: Mon, 25 Apr 2016 14:59:48 -0600
Subject: 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
---
 components/script/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'components/script/lib.rs')

diff --git a/components/script/lib.rs b/components/script/lib.rs
index 05700431c3d..4feaae05845 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -73,6 +73,8 @@ extern crate smallvec;
 #[macro_use]
 extern crate style;
 extern crate time;
+#[cfg(any(target_os = "macos", target_os = "linux"))]
+extern crate tinyfiledialogs;
 extern crate unicase;
 extern crate url;
 #[macro_use]
-- 
cgit v1.2.3