[webkit-dev] [PATCH] Use 'Ok' and 'Cancel' buttons in JavaScript confirm box.

Adam Barth abarth at webkit.org
Tue Jan 10 11:35:33 PST 2012


Thanks, but we don't usually accept patches via the mailing list.
Instead, we use <https://bugs.webkit.org/>.

Please see http://www.webkit.org/coding/contributing.html for more
information about how to contribute patches to the project.

Adam


On Tue, Jan 10, 2012 at 11:29 AM, Johannes Obermayr
<johannesobermayr at gmx.de> wrote:
> See: http://www.javascripter.net/faq/confirm.htm
>
> Fixes: https://bugs.kde.org/show_bug.cgi?id=287629
> ---
>  Source/WebKit/qt/Api/qwebpage.cpp |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Source/WebKit/qt/Api/qwebpage.cpp b/Source/WebKit/qt/Api/qwebpage.cpp
> index 8f0f153..acd2bd6 100644
> --- a/Source/WebKit/qt/Api/qwebpage.cpp
> +++ b/Source/WebKit/qt/Api/qwebpage.cpp
> @@ -2119,7 +2119,7 @@ void QWebPage::javaScriptAlert(QWebFrame *frame, const QString& msg)
>     This function is called whenever a JavaScript program running inside \a frame calls the confirm() function
>     with the message, \a msg. Returns true if the user confirms the message; otherwise returns false.
>
> -    The default implementation executes the query using QMessageBox::information with QMessageBox::Yes and QMessageBox::No buttons.
> +    The default implementation executes the query using QMessageBox::information with QMessageBox::Ok and QMessageBox::Cancel buttons.
>  */
>  bool QWebPage::javaScriptConfirm(QWebFrame *frame, const QString& msg)
>  {
> @@ -2128,7 +2128,7 @@ bool QWebPage::javaScriptConfirm(QWebFrame *frame, const QString& msg)
>     return true;
>  #else
>     QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
> -    return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Yes, QMessageBox::No);
> +    return QMessageBox::Ok == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Ok, QMessageBox::Cancel);
>  #endif
>  }
>
> --
> 1.7.7
>
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev


More information about the webkit-dev mailing list