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

[Adnane Belmadiaf]

Added support for confirm dialogs

[Olivier Tilloy (osomon)]

Looks great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/webbrowser-app-autolanding/247/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3830/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-autolanding/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-autolanding/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-autolanding/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3842/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1360/console

review: Needs Fixing (continuous-integration)

[lp:~daker/webbrowser-app/fix.1169758]

325. By Adnane Belmadiaf on 2013-09-24

Merged trunk
Fixed merge conflicts

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/app/Browser.qml'
--- src/app/Browser.qml	2013-09-24 09:43:09 +0000
+++ src/app/Browser.qml	2013-09-24 10:11:38 +0000
@@ -346,10 +346,12 @@
             devicePixelRatio: browser.qtwebkitdpr
 
             experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled
+
             experimental.certificateVerificationDialog: CertificateVerificationDialog { }
             experimental.authenticationDialog: AuthenticationDialog {}
             experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}
             experimental.alertDialog: AlertDialog { }
+            experimental.confirmDialog: ConfirmDialog { }
 
             selectionActions: ActionList {
                 Action {

=== added file 'src/app/ConfirmDialog.qml'
--- src/app/ConfirmDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/ConfirmDialog.qml	2013-09-24 10:11:38 +0000
@@ -0,0 +1,38 @@
+/*
+ * 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 Confirmation")
+    text: model.message
+
+    Button {
+        text: i18n.tr("OK")
+        onClicked: model.accept()
+    }
+
+    Button {
+        text: i18n.tr("Cancel")
+        onClicked: model.reject()
+    }
+
+    Component.onCompleted: show()
+}
\ No newline at end of file