Merge lp:~daker/webbrowser-app/fix.1169757 into lp:webbrowser-app

[Adnane Belmadiaf]

Added support for Alert dialogs

[Olivier Tilloy (osomon)]

Looks great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file 'src/app/AlertDialog.qml'
--- src/app/AlertDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/AlertDialog.qml	2013-09-21 19:57:28 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1 as Popups
+
+Popups.Dialog {
+    title: i18n.tr("JavaScript Alert")
+    text: model.message
+
+    Button {
+        text: i18n.tr("OK")
+        onClicked: model.dismiss()
+    }
+
+    Component.onCompleted: show()
+}
\ No newline at end of file

=== modified file 'src/app/Browser.qml'
--- src/app/Browser.qml	2013-09-19 19:39:50 +0000
+++ src/app/Browser.qml	2013-09-21 19:57:28 +0000
@@ -346,6 +346,7 @@
             devicePixelRatio: browser.qtwebkitdpr
 
             experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled
+            experimental.alertDialog: AlertDialog { }
 
             selectionActions: ActionList {
                 Action {