Title: [119315] trunk/Source/WebKit/qt
- Revision
- 119315
- Author
- [email protected]
- Date
- 2012-06-02 00:12:44 -0700 (Sat, 02 Jun 2012)
Log Message
[Qt] Use 'Ok' and 'Cancel' buttons in _javascript_ confirm box.
https://bugs.webkit.org/show_bug.cgi?id=76190
Based on Johannes Obermayrs ([email protected]) patch.
See: http://www._javascript_er.net/faq/confirm.htm
Fixes: https://bugs.kde.org/show_bug.cgi?id=287629
Patch by Zoltan Arvai <[email protected]> on 2012-06-02
Reviewed by Simon Hausmann.
* Api/qwebpage.cpp:
(QWebPage::_javascript_Confirm):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (119314 => 119315)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-06-02 06:44:08 UTC (rev 119314)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-06-02 07:12:44 UTC (rev 119315)
@@ -2096,7 +2096,7 @@
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::_javascript_Confirm(QWebFrame *frame, const QString& msg)
{
@@ -2109,8 +2109,8 @@
box.setWindowTitle(tr("_javascript_ Confirm - %1").arg(mainFrame()->url().host()));
box.setTextFormat(Qt::PlainText);
box.setText(msg);
- box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
- return QMessageBox::Yes == box.exec();
+ box.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
+ return QMessageBox::Ok == box.exec();
#endif
}
Modified: trunk/Source/WebKit/qt/ChangeLog (119314 => 119315)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-02 06:44:08 UTC (rev 119314)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-02 07:12:44 UTC (rev 119315)
@@ -1,3 +1,16 @@
+2012-06-02 Zoltan Arvai <[email protected]>
+
+ [Qt] Use 'Ok' and 'Cancel' buttons in _javascript_ confirm box.
+ https://bugs.webkit.org/show_bug.cgi?id=76190
+ Based on Johannes Obermayrs ([email protected]) patch.
+ See: http://www._javascript_er.net/faq/confirm.htm
+ Fixes: https://bugs.kde.org/show_bug.cgi?id=287629
+
+ Reviewed by Simon Hausmann.
+
+ * Api/qwebpage.cpp:
+ (QWebPage::_javascript_Confirm):
+
2012-06-01 Caio Marcelo de Oliveira Filho <[email protected]>
[Qt] Fix QObject bridge tests in Qt5 after (not so) recent QVariant changes
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
